Mercurial > public > mercurial-scm > hg-stable

diff tests/test-copy-move-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 38f92d12357c
children 8e6d5b7317e6
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-copy-move-merge.t	Wed Oct 07 00:01:16 2015 -0700
@@ -35,12 +35,12 @@
    preserving a for resolve of c
   removing a
    b: remote moved from a -> m
-  picked tool 'internal:merge' for b (binary False symlink False)
+  picked tool ':merge' for b (binary False symlink False)
   merging a and b to b
   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
    c: remote moved from a -> m
-  picked tool 'internal:merge' for c (binary False symlink False)
+  picked tool ':merge' for c (binary False symlink False)
   merging a and c to c
   my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful