# HG changeset patch
# User fahad
# Date 1424954515 0
# Node ID d86d685273ceba29999e1240effaea959b0043f8
# Parent  eb97e8361211a5dd363716f8641120f566d42c7d# Parent  26b71a36f55f5f7840bcf22c7a44ac9639969992
merged

diff -r eb97e8361211 -r d86d685273ce thys/Test.txt
--- 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
diff -r eb97e8361211 -r d86d685273ce thys/Test.txt~
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thys/Test.txt~	Thu Feb 26 12:41:55 2015 +0000
@@ -0,0 +1,1 @@
+test
diff -r eb97e8361211 -r d86d685273ce thys/new test
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thys/new test	Thu Feb 26 12:41:55 2015 +0000
@@ -0,0 +1,1 @@
+ssh://fahad@talisker.inf.kcl.ac.uk//Users/urbanc/HGREPOS/lexing