blob: 230eba9eb269af72a059d8017d293e3b375e751a (plain)

ofs	hex dump	ascii
0000	44 49 52 43 00 00 00 02 00 00 00 07 51 67 2a a4 00 00 00 00 51 67 2a a4 00 00 00 00 01 00 00 05	DIRC........Qg*.....Qg*.........
0020	02 fe cb f8 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 1d 23 3c 09 19 c9 98 ed 11 0a 4b 6f f3	....................#<.......Ko.
0040	6f 35 3a ec 8b 71 34 87 00 13 61 64 64 65 64 2d 69 6e 2d 6d 61 73 74 65 72 2e 74 78 74 00 00 00	o5:..q4...added-in-master.txt...
0060	00 00 00 00 51 67 2a a4 00 00 00 00 51 67 2a a4 00 00 00 00 01 00 00 05 02 fe cb f9 00 00 81 a4	....Qg*.....Qg*.................
0080	00 00 01 f5 00 00 00 14 00 00 00 f7 ee 3f a1 b8 c0 0a ff 7f e0 20 65 fd b5 08 64 bb 0d 93 2c cf	.............?........e...d...,.
00a0	00 11 61 75 74 6f 6d 65 72 67 65 61 62 6c 65 2e 74 78 74 00 51 67 2a a4 00 00 00 00 51 67 2a a4	..automergeable.txt.Qg*.....Qg*.
00c0	00 00 00 00 01 00 00 05 02 fe cb fa 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 11 ab 6c 44 a2	.............................lD.
00e0	e8 44 92 ad 4b 41 bb 6b ac 87 35 3e 9d 02 ac 8b 00 15 63 68 61 6e 67 65 64 2d 69 6e 2d 62 72 61	.D..KA.k..5>......changed-in-bra
0100	6e 63 68 2e 74 78 74 00 00 00 00 00 51 67 2a a4 00 00 00 00 51 67 2a a4 00 00 00 00 01 00 00 05	nch.txt.....Qg*.....Qg*.........
0120	02 fe cb fb 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 12 11 de ab 00 b2 d3 a6 f5 a3 07 39 88	..............................9.
0140	ac 05 0c 2d 7b 66 55 e2 00 15 63 68 61 6e 67 65 64 2d 69 6e 2d 6d 61 73 74 65 72 2e 74 78 74 00	...-{fU...changed-in-master.txt.
0160	00 00 00 00 51 67 2a a4 00 00 00 00 51 67 2a a4 00 00 00 00 01 00 00 05 02 fe cb fc 00 00 81 a4	....Qg*.....Qg*.................
0180	00 00 01 f5 00 00 00 14 00 00 00 2a 4e 88 6e 60 25 29 ca a9 ab 11 d7 1f 86 63 4b d1 b6 e0 de 10	...........*N.n`%).......cK.....
01a0	00 0f 63 6f 6e 66 6c 69 63 74 69 6e 67 2e 74 78 74 00 00 00 51 67 2a a4 00 00 00 00 51 67 2a a4	..conflicting.txt...Qg*.....Qg*.
01c0	00 00 00 00 01 00 00 05 02 fe cb fd 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 1a df e3 f2 2b	...............................+
01e0	aa 1f 6f ce 54 47 90 1c 30 86 ba e3 68 de 6b dd 00 15 72 65 6d 6f 76 65 64 2d 69 6e 2d 62 72 61	..o.TG..0...h.k...removed-in-bra
0200	6e 63 68 2e 74 78 74 00 00 00 00 00 51 67 2a a4 00 00 00 00 51 67 2a a4 00 00 00 00 01 00 00 05	nch.txt.....Qg*.....Qg*.........
0220	02 fe cb fe 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 1f c8 f0 6f 2e 3b b2 96 41 74 67 7e 91	......................o.;..Atg~.
0240	f0 ab ea d0 e4 3c 9e 5d 00 0d 75 6e 63 68 61 6e 67 65 64 2e 74 78 74 00 00 00 00 00 91 31 8a e0	.....<.]..unchanged.txt......1..
0260	9d 35 46 9a f1 a5 e4 59 c4 f1 3b fe 97 5c 84 13	.5F....Y..;..\..