changeset 22046 | 7a9cbb315d84 |
parent 20117 | aa9385f983fa |
child 23172 | e955549cd045 |
--- 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