Skip to content
Snippets Groups Projects
Commit 5caae380 authored by Kostia Balytskyi's avatar Kostia Balytskyi
Browse files

filemerge: pass a default value to _toolstr (issue5718)

After a refactoring, _toolstr stopped having default="" as one of it's args,
therefore when called without a default it returns None and not "". This causes
concatenation to fail.
parent d2554ef0
No related branches found
No related tags found
No related merge requests found
......@@ -116,7 +116,7 @@
continue
p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
if p:
p = util.findexe(p + _toolstr(ui, tool, "regappend"))
p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
if p:
return p
exe = _toolstr(ui, tool, "executable", tool)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment