aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PostImage
blob: 4e5d5b2d8834e9b05140000cf7239036e0d7f954 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
line1
line2
line3
line4
line5
line6
line7
line8
<<<<<<< HEAD
=======
line3
lineB
line5
line6
>>>>>>> PATCH