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.
% no repo
abort: There is no Mercurial repository here (.hg not found)
% create repo
adding a
% basic id usage
cb9a9f314b8b tip
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip
cb9a9f314b8b
cb9a9f314b8b tip
% with options
cb9a9f314b8b tip
0
tip
default
cb9a9f314b8b
cb9a9f314b8b 0 default tip
% with modifications
cb9a9f314b8b+ 0+ default tip
% other local repo
cb9a9f314b8b+ tip
cb9a9f314b8b+ tip
% with remote http repo
cb9a9f314b8b
% remote with tags?
abort: can't query remote revision number, branch, or tags