org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PostImage - jgit - Git at Google

blob: a963b40dfefed1d75d295ccc340fd6e12de03288 [file]

	line1
	line2
	<<<<<<< HEAD
	line3
	line4
	line5
	line6
	=======
	line3
	lineB
	line5
	line6
	>>>>>>> PATCH
	line7
	line8