--- a/thys/Test.txt	Sat Feb 14 08:35:21 2015 +0000
+++ b/thys/Test.txt	Thu Feb 26 12:41:55 2015 +0000
@@ -1,1 +1,7 @@
+<<<<<<< local
 test2
+=======
+test
+test file
+
+>>>>>>> other