Mercurial > public > mercurial-scm > hg

diff mercurial/filemerge.py @ 6533:65f1b97484be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 13 Apr 2008 11:31:45 -0500
parents 368a4ec603cc 2b181fb3a70a
children 86e8187b721a
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Apr 11 15:14:00 2008 +0200
+++ b/mercurial/filemerge.py	Sun Apr 13 11:31:45 2008 -0500
@@ -16,6 +16,8 @@
     return ui.configbool("merge-tools", tool + "." + part, default)
 
 def _findtool(ui, tool):
+    if tool in ("internal:fail", "internal:local", "internal:other"):
+        return tool
     k = _toolstr(ui, tool, "regkey")
     if k:
         p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))