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 dir/bar
adding foo
dir/bar
foo
committed changeset 0:d44511117907
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2
committed changeset 1:a85812e0561a
adding a
adding c
removing a
adding b
removing c
adding d
recording removal of a as rename to b (100% similar)