tests/test-symlink-addremove.out

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.

% directory moved and symlinked
adding foo/a
% now addremove should remove old files
adding bar/a
adding foo
removing foo/a