##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: handle missing regappend
Matt Mackall -
r6013:bb441d77 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -9,7 +9,7 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):
General Comments 0
You need to be logged in to leave comments. Login now