allowconflict_file_deleted.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_file_deleted.patch

blob: c9655a5e6b95f3a958f9fdc0791082b7f8c05a56 (plain)

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