Mercurial > hg > mercurial-source

diff mercurial/filemerge.py @ 23148:b405dd6c90bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: split the logic for finding an external tool to its own function This will be used by extdiff in an subsequent patch.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 02 Nov 2014 14:58:50 -0500 (2014-11-02)
parents 38e0363dcbe0
children 41c03b7592ed
line wrap: on
line diff
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -37,6 +37,9 @@
 def _findtool(ui, tool):
     if tool in internals:
         return tool
+    return findexternaltool(ui, tool)
+
+def findexternaltool(ui, tool):
     for kn in ("regkey", "regkeyalt"):
         k = _toolstr(ui, tool, kn)
         if not k: