test-merge-changedelete.t fails with my hgmerge

[timeless]

Bryan O'Sullivan wrote:
> A long time ago, the default external merge program that we looked for was
> called hgmerge, and there's still backwards compatibility code in
> filemerge.py to support it.

Yeah, I have some vague recollection of this.
What's odd is that I'm pretty sure my hgmerge script has been on
gcc112 for a while w/o breaking anything...

> The tests are as self-contained as they can reasonably be, but the only
> viable way to achieve this is to put a special bindir at the front of PATH.
> That bindir is prepopulated with special versions of important commands, but
> hgmerge isn't in that set.

I'm half leaning towards this. Specifically trying to do so in a way
where we remove the rest of PATH.

> The obviously easiest thing to do is delete your local hgmerge script and
> move on,

This is what I've done so far.

> unless you want to insert a hgmerge command into the special bindir
> – but I can almost guarantee that doing so will break other tests.

> Any "more general" attempt at a fix probably won't actually help anyone except you.

Probably, although, most likely it'll help me differently on various
different computers :-)