Mercurial > hg

comparison mercurial/filemerge.py @ 6013:bb441d77df99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: handle missing regappend
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Feb 2008 09:51:56 -0600
parents 090b1a665901
children 26ef792f834e
comparison
equal deleted inserted replaced
6012:e45de0f47215 6013:bb441d77df99
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