tests/test-merge-tools.t

--- a/tests/test-merge-tools.t	Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-merge-tools.t	Wed Nov 16 03:45:14 2011 +0100
@@ -1,3 +1,5 @@
+  $ "$TESTDIR/hghave" system-sh || exit 80
+
 test merge-tools configuration - mostly exercising filemerge.py
 
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test