changeset 23148 | b405dd6c90bf |
parent 22707 | 38e0363dcbe0 |
child 23270 | 41c03b7592ed |
--- a/mercurial/filemerge.py Sun Nov 02 13:18:08 2014 -0800 +++ b/mercurial/filemerge.py Sun Nov 02 14:58:50 2014 -0500 @@ -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: