Mercurial Mercurial > hg > lexing / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
thys/Test.txt
changeset 95 a33d3040bf7e
parent 94 5b01f7c233f8
child 96 c3d7125f9950 
--- a/thys/Test.txt	Tue Feb 02 02:27:16 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<<<<<<< local
-test2
-=======
-test
-test file
-
->>>>>>> other
lexing