equal
deleted
inserted
replaced
34 |
34 |
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=None): |
38 def _toollist(ui, tool, part, default=None): |
39 return ui.configlist("merge-tools", tool + "." + part, default or []) |
39 if default is None: |
|
40 default = [] |
|
41 return ui.configlist("merge-tools", tool + "." + part, default) |
40 |
42 |
41 internals = {} |
43 internals = {} |
42 # Merge tools to document. |
44 # Merge tools to document. |
43 internalsdoc = {} |
45 internalsdoc = {} |
44 |
46 |