Mercurial > hg
diff tests/test-sparse-merges.t @ 34946:5caae380ff90 stable
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.
author | Kostia Balytskyi <ikostia@fb.com> |
---|---|
date | Thu, 26 Oct 2017 11:07:06 -0700 |
parents | c9cbf4de27ba |
children | 91c405f84cf7 |