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.
adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
searching for copies back to rev 1
a: update permissions -> e
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
searching for copies back to rev 1
a: remote is newer -> g
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)