conflict.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/conflict.patch

blob: 547fcdae26822be062158945d676d643c0b51329 (plain)

diff --git a/conflict b/conflict
index 2e65efe..7898192 100644
--- a/conflict
+++ b/conflict
@@ -1 +1 @@
-a different preimage line
\ No newline at end of file
+a new line