Mercurial Mercurial > hg / 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 26611 a5ff66e6d77a
parent 26517 d8463a743d7d
child 26614 ef1eb6df7071 
--- a/tests/test-graft.t	Sun Oct 11 20:04:40 2015 -0700
+++ b/tests/test-graft.t	Sun Oct 11 20:47:14 2015 -0700
@@ -187,6 +187,8 @@
   picked tool ':merge' for e (binary False symlink False)
   merging e
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
+  picked tool ':merge' for e (binary False symlink False)
+  my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
Mercurial