# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2008-02-04 15:51:56
# Node ID bb441d77df99d89cb58a00695f5bd17ffad2e8de
# Parent  e45de0f47215a5a49a05d678e56b6a1fde0479ee

filemerge: handle missing regappend

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -9,7 +9,7 @@ from node import *
 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):