equal
deleted
inserted
replaced
7 |
7 |
8 from node import * |
8 from node import * |
9 from i18n import _ |
9 from i18n import _ |
10 import util, os, tempfile, context, simplemerge, re |
10 import util, os, tempfile, context, simplemerge, re |
11 |
11 |
12 def _toolstr(ui, tool, part, default=None): |
12 def _toolstr(ui, tool, part, default=""): |
13 return ui.config("merge-tools", tool + "." + part, default) |
13 return ui.config("merge-tools", tool + "." + part, default) |
14 |
14 |
15 def _toolbool(ui, tool, part, default=False): |
15 def _toolbool(ui, tool, part, default=False): |
16 return ui.configbool("merge-tools", tool + "." + part, default) |
16 return ui.configbool("merge-tools", tool + "." + part, default) |
17 |
17 |