Mercurial > hg

comparison mercurial/filemerge.py @ 7873:4a4c7f6a5912

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: drop unused imports
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Mon, 23 Mar 2009 13:12:07 +0100
parents 4c92d8971809
children a1a5a57efe90
comparison
equal deleted inserted replaced
7872:f680a1bd679b 7873:4a4c7f6a5912
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 nullrev, short 8 from node import short
9 from i18n import _ 9 from i18n import _
10 import util, os, tempfile, 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)