Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 6211:f89fd07fc51d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand import * to allow Pyflakes to find problems
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:26 +0100
parents 0ee885fea464
children e75aab656f46
comparison
equal deleted inserted replaced
6210:942287cb1f57 6211:f89fd07fc51d
3 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> 3 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
4 # 4 #
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 * 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, context, 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)