view tests/test-symlink-root @ 7785:660c8dd44060

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.

#!/bin/sh

"$TESTDIR/hghave" symlink || exit 80

hg init a
ln -s a link
cd a
echo foo > foo
hg status
hg status ../link