Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-commit.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-merge-commit.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-merge-commit.t	Wed Oct 07 00:01:16 2015 -0700
@@ -73,7 +73,7 @@
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
    preserving bar for resolve of bar
    bar: versions differ -> m
-  picked tool 'internal:merge' for bar (binary False symlink False)
+  picked tool ':merge' for bar (binary False symlink False)
   merging bar
   my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
    premerge successful
@@ -159,7 +159,7 @@
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
    preserving bar for resolve of bar
    bar: versions differ -> m
-  picked tool 'internal:merge' for bar (binary False symlink False)
+  picked tool ':merge' for bar (binary False symlink False)
   merging bar
   my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
    premerge successful