test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
% unbundle
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
d/b
% move and copy
a
d/b
% bundle
2 changesets found
pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 6 changes to 6 files
(run 'hg update' to get a working copy)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
d/b