Show More
| @@ -9,7 +9,7 from node import * | |||
|
|
9 | 9 | from i18n import _ |
|
|
10 | 10 | import util, os, tempfile, context, simplemerge, re |
|
|
11 | 11 | |
|
|
12 |
def _toolstr(ui, tool, part, default= |
|
|
|
12 | def _toolstr(ui, tool, part, default=""): | |
|
|
13 | 13 | return ui.config("merge-tools", tool + "." + part, default) |
|
|
14 | 14 | |
|
|
15 | 15 | def _toolbool(ui, tool, part, default=False): |
General Comments 0
You need to be logged in to leave comments.
Login now