tests/test-convert-cvs-detectmerge

--- a/tests/test-convert-cvs-detectmerge	Mon May 11 00:16:49 2009 +0200
+++ b/tests/test-convert-cvs-detectmerge	Mon May 11 23:42:03 2009 +0200
@@ -6,7 +6,8 @@
 
 "$TESTDIR/hghave" cvs || exit 80
 
-export CVSROOT=`pwd`/cvsrepo
+CVSROOT=`pwd`/cvsrepo
+export CVSROOT
 
 # XXX copied from test-convert-cvs-synthetic
 cvscall()