Failing test-merge-tools

[Mads Kiilerich]

Dirkjan Ochtman wrote:
>> It looks like the test hangs. Any idea where it is hanging? What platform is
>> this?
>>     
>
> Fedora Core 5, with Python 2.4. But I saw the same thing happening on
> my up-to-date Gentoo box with 2.5.
>   

Ok, I can reproduce it. It is hanging in an interactive merge started 
from hgmerge. Can you confirm that these machines have a hgmerge in the 
path?

AFAIK it has "always" been hardcoded that Mercurial searches for hgmerge 
as last resort before falling back to the final last resort of using 
internalmerge.

Matt, would it be OK to add an option to disable that?

Or should the test set up a PATH where we are sure there is no hgmerge?

/Mads