comparison tests/test-convert-svn-move @ 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 c1b47c0fd2b6
children a6e2e60b34d0
comparison
equal deleted inserted replaced
6521:a3668330f14a 6522:2b181fb3a70a