Failing test-merge-tools

[Mads Kiilerich]

Dirkjan Ochtman wrote:
>> 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?
>>     
>
> Can't we just use hg merge -y or whatever? There are probably other
> merge tests that do this correctly, right?
>   

Other tests relies on run-tests.py to set HGMERGE and thus bypass the 
code that this test tests. This test unsets HGMERGE.

The problem is that when we want to test that the last last resort is 
internal merge then mercurial finds and uses /usr/bin/hgmerge which 
launches an interactive tool. I don't think -y can mute that.

/Mads