Mercurial > public > mercurial-scm > hg

diff tests/test-rename-merge1.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-rename-merge1.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-rename-merge1.t	Wed Oct 07 00:01:16 2015 -0700
@@ -41,7 +41,7 @@
    b2: remote created -> g
   getting b2
    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@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful