Show More
@@ -35,8 +35,8 b' def _toolstr(ui, tool, part, default="")' | |||||
35 | def _toolbool(ui, tool, part, default=False): |
|
35 | def _toolbool(ui, tool, part, default=False): | |
36 | return ui.configbool("merge-tools", tool + "." + part, default) |
|
36 | return ui.configbool("merge-tools", tool + "." + part, default) | |
37 |
|
37 | |||
38 |
def _toollist(ui, tool, part, default= |
|
38 | def _toollist(ui, tool, part, default=None): | |
39 | return ui.configlist("merge-tools", tool + "." + part, default) |
|
39 | return ui.configlist("merge-tools", tool + "." + part, default or []) | |
40 |
|
40 | |||
41 | internals = {} |
|
41 | internals = {} | |
42 | # Merge tools to document. |
|
42 | # Merge tools to document. |
General Comments 0
You need to be logged in to leave comments.
Login now