use internal merge tool when specified for a merge-pattern in hgrc
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
--- a/mercurial/filemerge.py Fri Apr 04 02:20:58 2008 +0300
+++ b/mercurial/filemerge.py Fri Apr 04 02:21:53 2008 +0300
@@ -16,6 +16,8 @@
return ui.configbool("merge-tools", tool + "." + part, default)
def _findtool(ui, tool):
+ if tool in ("internal:fail", "internal:local", "internal:other"):
+ return tool
k = _toolstr(ui, tool, "regkey")
if k:
p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))