--- a/tests/test-merge-types.t	Wed Aug 06 10:34:54 2014 -0500
+++ b/tests/test-merge-types.t	Wed Aug 06 11:43:59 2014 -0500
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" symlink execbit || exit 80
+#require symlink execbit
 
   $ tellmeabout() {
   > if [ -h $1 ]; then