--- a/tests/test-merge-types.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-merge-types.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,4 +1,4 @@ - $ "$TESTDIR/hghave" symlink || exit 80 + $ "$TESTDIR/hghave" symlink execbit || exit 80 $ hg init