Mercurial > public > mercurial-scm > hg

diff tests/test-merge-tools.t @ 15519:bb9ad375b51c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add 'hghave system-sh' to skip tests on windows
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 16 Nov 2011 03:45:14 +0100
parents 157d93c41c10
children e7119b091809
line wrap: on
line diff
--- 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