Mercurial > hg

diff tests/test-merge-tools.t @ 22707:38e0363dcbe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: switch the default name for internal tools from internal:x to :x
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:28 +0200
parents ad25986c4cd3
children 9d0b6ef92eb2
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Sun Sep 28 17:15:25 2014 +0200
+++ b/tests/test-merge-tools.t	Sun Sep 28 17:15:28 2014 +0200
@@ -970,7 +970,7 @@
   $ hg commit -qm 'f is symlink'
   $ hg merge -r 2 --tool internal:merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon