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 26517 d8463a743d7d
parent 26229 d1530c6e8613
child 26611 a5ff66e6d77a 
--- a/tests/test-graft.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-graft.t	Wed Oct 07 00:01:16 2015 -0700
@@ -154,7 +154,7 @@
    ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
    preserving b for resolve of b
    b: local copied/moved from a -> m
-  picked tool 'internal:merge' for b (binary False symlink False)
+  picked tool ':merge' for b (binary False symlink False)
   merging b and a to b
   my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
    premerge successful
@@ -184,7 +184,7 @@
   getting d
    b: remote unchanged -> k
    e: versions differ -> m
-  picked tool 'internal:merge' for e (binary False symlink False)
+  picked tool ':merge' for e (binary False symlink False)
   merging e
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
   warning: conflicts during merge.
Mercurial