Index: README
===================================================================
--- README
+++ README
@@ -1,11 +1,14 @@
-test-repo
+dslkfjtest-repo
 added line 2
 added line 3

 Added line 4 and 5. This{
   is a big change!
 }
+<<<<<<< working copy
+=======
+>>>>>>> destination

 Added line 4 and 5. This{
   is a big change!
 }