Mercurial > hg-stable
view README @ 6522:2b181fb3a70a
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.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:21:53 +0300 |
parents | 1158d7018052 |
children | 1de6e7e1bb9f |
line wrap: on
line source
Basic install: $ make # see install targets $ make install # do a system-wide install $ hg debuginstall # sanity-check setup $ hg # see help See http://www.selenic.com/mercurial/ for detailed installation instructions, platform-specific notes, and Mercurial user information.