Produced by Araxis Merge on 29.08.2019 1:49:32. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\PS3\FirmwareExtractor\Firmware_4.82\Part5_dec\dev_flash\vsh\module | explore_category_friend.elf | Wed Aug 28 18:45:50 2019 UTC |
| 2 | C:\PS3\FirmwareExtractor\Firmware_4.84\Part5_dec\dev_flash\vsh\module | explore_category_friend.elf | Wed Aug 28 13:39:29 2019 UTC |
| 3 | C:\PS3\FirmwareExtractor\Firmware_4.85\Part5_dec\dev_flash\vsh\module | explore_category_friend.elf | Wed Aug 28 11:08:26 2019 UTC |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 |
Between Files 2 and 3 |
Relative to Common Ancestor |
|||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 2 | 24014 | 2 | 24014 | ||
| Changed | 1 | 2 | 1 | 2 | 0 | 0 |
| Inserted | 0 | 0 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 0 | 0 |
| Note: An automatic merge would leave 1 conflict(s). | ||||||
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are ignored |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| {Ѕ\x0000 8„оC Уx;a\x0001@KшyЅ < \x0000 | {Ѕ\x0000 8„оC Уx;a\x0001@KшyЅ < \x0000 | {Ѕ\x0000 8„оC Уx;a\x0001@KшyЅ < \x0000 | |||||
| 8\x0000\x0000\x00008А\x0000\x00048а \x0000\x00089\x0000\x0000 \x0002 9 \x0000\x0000{{\x0000 8Ґ оЁ8Ђ\x0000\x0010Јлx ш\x001D\x0000\x0008ш\x001D\x0000\x0000H\x0004 ’э;Ѓ\x0000ґҐлx DУxcЫx{њ \x0000 Kяь•;Ў\x0000Р < \x0000 | 8\x0000\x0000\x00008А\x0000\x00048а \x0000\x00089\x0000\x0000 \x0004 9 \x0000\x0000{{\x0000 8Ґ оЁ8Ђ\x0000\x0010Јлx ш\x001D\x0000\x0008ш\x001D\x0000\x0000H\x0004 ’э;Ѓ\x0000ґҐлx DУxcЫx{њ \x0000 Kяь•;Ў\x0000Р < \x0000 | 8\x0000\x0000\x00008А\x0000\x00048а \x0000\x00089\x0000\x0000 \x0005 9 \x0000\x0000{{\x0000 8Ґ оЁ8Ђ\x0000\x0010Јлx ш\x001D\x0000\x0008ш\x001D\x0000\x0000H\x0004 ’э;Ѓ\x0000ґҐлx DУxcЫx{њ \x0000 Kяь•;Ў\x0000Р < \x0000 | |||||
| {Ѕ\x0000 8Ґоёѓ гxdЫxKяьy %Лx„гxЈ лxKяых¤лx CУxKшyЌЈ лxKшzбѓгx KшzЩcЫxKш zСЂ\x0001\x0001\x0004Ђ~\x0000€ +Ђ\x0000\x000F8Ѓ\x0000р@ќ \x0000\x0008ЂЃ\x0000рxc\x0000 x„\x0000 H\x0004=!/ѓ \x0000\x0000|}\x001Bx@ћ\x0002њ /–\x0000\x0000Aћ\x0000\x000Czг \x0000 H\x0004›х<Ђ\x0001Й Ђ~\x0000€{\x001C\x0000 `„ ГЂH\x00049б/ѓ\x0000\x0000 |}\x001Bx@ћ\x0003Lѓ гx; яяKясЭ ;@\x0000\x0000Tc\x0006>; \x0000\x0000/ѓ\x0000\x0000@ћ\x0002„ 8x\x0000ЊЂћ\x0000€< \x0000 | {Ѕ\x0000 8Ґоёѓ гxdЫxKяьy %Лx„гxЈ лxKяых¤лx CУxKшyЌЈ лxKшzбѓгx KшzЩcЫxKш zСЂ\x0001\x0001\x0004Ђ~\x0000€ +Ђ\x0000\x000F8Ѓ\x0000р@ќ \x0000\x0008ЂЃ\x0000рxc\x0000 x„\x0000 H\x0004=!/ѓ \x0000\x0000|}\x001Bx@ћ\x0002њ /–\x0000\x0000Aћ\x0000\x000Czг \x0000 H\x0004›х<Ђ\x0001Й Ђ~\x0000€{\x001C\x0000 `„ ГЂH\x00049б/ѓ\x0000\x0000 |}\x001Bx@ћ\x0003Lѓ гx; яяKясЭ ;@\x0000\x0000Tc\x0006>; \x0000\x0000/ѓ\x0000\x0000@ћ\x0002„ 8x\x0000ЊЂћ\x0000€< \x0000 | {Ѕ\x0000 8Ґоёѓ гxdЫxKяьy %Лx„гxЈ лxKяых¤лx CУxKшyЌЈ лxKшzбѓгx KшzЩcЫxKш zСЂ\x0001\x0001\x0004Ђ~\x0000€ +Ђ\x0000\x000F8Ѓ\x0000р@ќ \x0000\x0008ЂЃ\x0000рxc\x0000 x„\x0000 H\x0004=!/ѓ \x0000\x0000|}\x001Bx@ћ\x0002њ /–\x0000\x0000Aћ\x0000\x000Czг \x0000 H\x0004›х<Ђ\x0001Й Ђ~\x0000€{\x001C\x0000 `„ ГЂH\x00049б/ѓ\x0000\x0000 |}\x001Bx@ћ\x0003Lѓ гx; яяKясЭ ;@\x0000\x0000Tc\x0006>; \x0000\x0000/ѓ\x0000\x0000@ћ\x0002„ 8x\x0000ЊЂћ\x0000€< \x0000 |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2018 Araxis Ltd (www.araxis.com). All rights reserved.