Mercurial > public > mercurial-scm > hg

diff tests/test-double-merge.t @ 26517:d8463a743d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: normalize 'internal:foo' names to ':foo' In upcoming patches we're going to present these names in the UI -- it would be good not to present deprecated names.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:01:16 -0700
parents bd625cd4e5e7
children 8e6d5b7317e6
line wrap: on
line diff
--- a/tests/test-double-merge.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-double-merge.t	Wed Oct 07 00:01:16 2015 -0700
@@ -38,12 +38,12 @@
    preserving foo for resolve of bar
    preserving foo for resolve of foo
    bar: remote copied from foo -> m
-  picked tool 'internal:merge' for bar (binary False symlink False)
+  picked tool ':merge' for bar (binary False symlink False)
   merging foo and bar to bar
   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
    foo: versions differ -> m
-  picked tool 'internal:merge' for foo (binary False symlink False)
+  picked tool ':merge' for foo (binary False symlink False)
   merging foo
   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful