HomePhabricator

filemerge: pass a default value to _toolstr (issue5718)

Authored by ikostia.

Description

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.

Details

Committed
ikostiaOct 26 2017, 2:07 PM
Parents
rHGd2554ef04d26: children: fix the log expansion of `hg children` in doc
Branches
Unknown
Tags
Unknown