Mercurial Mercurial > hg > lexing / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
authorfahad
Thu, 26 Feb 2015 12:41:55 +0000
changeset 67 d86d685273ce
parent 66 eb97e8361211 (current diff)
parent 61 26b71a36f55f (diff)
child 68 f182c125980e
merged
thys/Test.txt file | annotate | diff | comparison | revisions 
--- 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
--- /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
--- /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
lexing