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