allowconflict.patch « diff « jgit « eclipse « org « tst-rsrc « org.eclipse.jgit.test - jgit.git - JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit

JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit

www-data

about summary refs log tree commit diff stats

path: root/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict.patch

blob: a99e636382f42c5e48b3cf709c695b0aee0cb1bb (plain)

diff --git a/allowconflict b/allowconflict
index 0000000..de98044
--- a/allowconflict
+++ b/allowconflict
@@ -3,4 +3,4 @@
 line3
-lineA
+lineB
 line5
 line6