Mercurial > hg
view tests/test-mq-qimport.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 | cee68264ed92 |
| children | 05ec27530d04 |
line wrap: on
line source
% build diff with CRLF adding b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % qimport CRLF diff adding b.diff to series file applying b.diff Now at: b.diff