Mercurial Mercurial > hg > lexing / comparison
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 67 d86d685273ce
parent 65 b31b224fa0e6
parent 61 26b71a36f55f
equal deleted inserted replaced
66:eb97e8361211 67:d86d685273ce 
       
     1 <<<<<<< local
 
     1 test2
 
     2 test2
 
       
     3 =======
 
       
     4 test
 
       
     5 test file
 
       
     6 
       
     7 >>>>>>> other
lexing