equal
deleted
inserted
replaced
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
8 from node import nullrev |
8 from node import nullrev |
9 from i18n import _ |
9 from i18n import _ |
10 import util, os, tempfile, context, simplemerge, re, filecmp |
10 import util, os, tempfile, simplemerge, re, filecmp |
11 |
11 |
12 def _toolstr(ui, tool, part, default=""): |
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): |