##// END OF EJS Templates
filemerge: split the logic for finding an external tool to its own function...
Matt Harbison -
r23148:b405dd6c default
parent child Browse files
Show More
@@ -37,6 +37,9 b' def internaltool(name, trymerge, onfailu'
37 def _findtool(ui, tool):
37 def _findtool(ui, tool):
38 if tool in internals:
38 if tool in internals:
39 return tool
39 return tool
40 return findexternaltool(ui, tool)
41
42 def findexternaltool(ui, tool):
40 for kn in ("regkey", "regkeyalt"):
43 for kn in ("regkey", "regkeyalt"):
41 k = _toolstr(ui, tool, kn)
44 k = _toolstr(ui, tool, kn)
42 if not k:
45 if not k:
General Comments 0
You need to be logged in to leave comments. Login now