tests/test-merge-tools.t

--- a/tests/test-merge-tools.t	Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-merge-tools.t	Thu Nov 17 23:02:18 2011 -0600
@@ -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