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-graft.t
changeset 30460 ce3a133f71b3
parent 30229 69ffbbe73dd0
child 30581 43a9e02a7b7f 
--- a/tests/test-graft.t	Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-graft.t	Sat Nov 19 15:41:37 2016 -0800
@@ -456,7 +456,7 @@
   c
   =======
   b
-  >>>>>>> graft: 5d205f8b35b6  - bar: 1
+  >>>>>>> graft: 5d205f8b35b6 - bar: 1
   $ echo b > a
   $ hg resolve -m a
   (no more unresolved files)
mercurial