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.
adding a
tree a0c8bcbbb45c
parent 000000000000
author test 0 0
committer test 0 0
revision 0
branch default
adda