##// END OF EJS Templates
filemerge: pass a default value to _toolstr (issue5718)...
Kostia Balytskyi -
r34947:5caae380 stable
parent child Browse files
Show More
@@ -116,7 +116,7 b' def findexternaltool(ui, tool):'
116 continue
116 continue
117 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
117 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
118 if p:
118 if p:
119 p = util.findexe(p + _toolstr(ui, tool, "regappend"))
119 p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
120 if p:
120 if p:
121 return p
121 return p
122 exe = _toolstr(ui, tool, "executable", tool)
122 exe = _toolstr(ui, tool, "executable", tool)
General Comments 0
You need to be logged in to leave comments. Login now