aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/conflict.patch
blob: 547fcdae26822be062158945d676d643c0b51329 (plain)
1
2
3
4
5
6
7
8
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