Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 6212:e75aab656f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused imports
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:41 +0100
parents f89fd07fc51d
children 368a4ec603cc 2b181fb3a70a
comparison
equal deleted inserted replaced
6211:f89fd07fc51d 6212:e75aab656f46
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):