summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--foo2
1 files changed, 1 insertions, 1 deletions
diff --git a/foo b/foo
index 5716ca5..9b1719f 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-bar
+conflict