view tests/test-empty.out @ 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 57729c56a23c
children 7e5f3480c45b
line wrap: on
line source

checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions