Mercurial > public > mercurial-scm > hg

diff tests/test-convert-cvs-detectmerge.t @ 22046:7a9cbb315d84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: replace exit 80 with #require
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Aug 2014 11:43:59 -0500
parents aa9385f983fa
children e955549cd045
line wrap: on
line diff
--- a/tests/test-convert-cvs-detectmerge.t	Wed Aug 06 10:34:54 2014 -0500
+++ b/tests/test-convert-cvs-detectmerge.t	Wed Aug 06 11:43:59 2014 -0500
@@ -1,8 +1,9 @@
+#require cvs
+
 Test config convert.cvsps.mergefrom config setting.
 (Should test similar mergeto feature, but I don't understand it yet.)
 Requires builtin cvsps.
 
-  $ "$TESTDIR/hghave" cvs || exit 80
   $ CVSROOT=`pwd`/cvsrepo
   $ export CVSROOT