Mercurial > hg

diff mercurial/filemerge.py @ 26518:a77679d0b887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: print correct name of tool for symlink checks Earlier we'd print ':merge' even if the tool was something else like ':union'. That's clearly a bug.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:24:44 -0700
parents d8463a743d7d
children 48476c6129a2
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Oct 07 00:01:16 2015 -0700
+++ b/mercurial/filemerge.py	Wed Oct 07 00:24:44 2015 -0700
@@ -231,8 +231,8 @@
 def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf):
     tool, toolpath, binary, symlink = toolconf
     if symlink:
-        repo.ui.warn(_('warning: internal :merge cannot merge symlinks '
-                       'for %s\n') % fcd.path())
+        repo.ui.warn(_('warning: internal %s cannot merge symlinks '
+                       'for %s\n') % (tool, fcd.path()))
         return False
     return True