summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMergeConflict/expected/repo/.git_keep/index
blob: bed2a78eca10827b0b73605f6e47bb6c7ad91ef5 (plain)
ofshex dumpascii
0000 44 49 52 43 00 00 00 02 00 00 00 04 62 3f cf fa 0b 4b aa 17 62 3f cf fa 0b 4b aa 17 01 00 00 05 DIRC........b?...K..b?...K......
0020 02 9e 31 7b 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 06 a5 bc e3 fd 25 65 d8 f4 58 55 5a 0c ..1{....................%e..XUZ.
0040 6f 42 d0 50 4a 84 8b d5 00 07 6d 79 66 69 6c 65 31 00 00 00 62 3f cf fa 0c 44 29 ce 62 3f cf fa oB.PJ.....myfile1...b?...D).b?..
0060 0c 44 29 ce 01 00 00 05 02 9e 31 92 00 00 81 a4 00 00 01 f5 00 00 00 14 00 00 00 06 18 0c f8 32 .D).......1....................2
0080 80 22 be ce e9 aa a2 57 7a 8f 84 ea 2b 9f 38 27 00 07 6d 79 66 69 6c 65 32 00 00 00 62 3f cf fc .".....Wz...+.8'..myfile2...b?..
00a0 08 31 a7 37 62 3f cf fc 08 31 a7 37 01 00 00 05 02 9e 32 30 00 00 81 a4 00 00 01 f5 00 00 00 14 .1.7b?...1.7......20............
00c0 00 00 00 06 df 6b 0d 2b cc 76 e6 ec 0f ca 20 c2 27 10 4a 4f 28 ba c4 1b 00 07 6d 79 66 69 6c 65 .....k.+.v......'.JO(.....myfile
00e0 33 00 00 00 62 3f cf ff 05 a1 b6 a7 62 3f cf ff 05 a1 b6 a7 01 00 00 05 02 9e 32 35 00 00 81 a4 3...b?......b?............25....
0100 00 00 01 f5 00 00 00 14 00 00 00 06 d2 34 c5 e0 57 fe 32 c6 76 ea 67 e8 cb 38 f4 62 5d da eb 54 .............4..W.2.v.g..8.b]..T
0120 00 07 6d 79 66 69 6c 65 34 00 00 00 54 52 45 45 00 00 00 19 00 34 20 30 0a 2f 61 74 05 03 80 43 ..myfile4...TREE.....4.0./at...C
0140 8f 14 b1 66 58 a3 56 e7 62 43 5c a5 91 52 45 55 43 00 00 00 40 6d 79 66 69 6c 65 34 00 30 00 31 ...fX.V.bC\..REUC...@myfile4.0.1
0160 30 30 36 34 34 00 31 30 30 36 34 34 00 9b 17 19 f5 cf 06 95 68 78 50 80 a0 bb ab be 7c 37 7e 22 00644.100644........hxP.....|7~"
0180 ae d2 34 c5 e0 57 fe 32 c6 76 ea 67 e8 cb 38 f4 62 5d da eb 54 f6 2e 70 36 b5 5d e8 33 a8 79 2c ..4..W.2.v.g..8.b]..T..p6.].3.y,
01a0 f5 f3 fe bd 30 9b c4 67 c6 ....0..g.