Mercurial > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sun Feb 03 23:08:16 2008 -0800
+++ b/mercurial/filemerge.py	Mon Feb 04 09:51:56 2008 -0600
@@ -9,7 +9,7 @@
 from i18n import _
 import util, os, tempfile, context, simplemerge, re
 
-def _toolstr(ui, tool, part, default=None):
+def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)
 
 def _toolbool(ui, tool, part, default=False):