Mercurial Mercurial > mercurial / 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.
tests/test-keyword.t
changeset 30460 ce3a133f71b3
parent 30062 940c05b25b07
child 32267 c2380b448265 
--- a/tests/test-keyword.t	Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-keyword.t	Sat Nov 19 15:41:37 2016 -0800
@@ -1117,7 +1117,7 @@
   bar
   =======
   foo
-  >>>>>>> merge rev:    85d2d2d732a5  - test: simplemerge
+  >>>>>>> merge rev:    85d2d2d732a5 - test: simplemerge
 
 resolve to local, m must contain hash of last change (local parent)
mercurial