diff tests/test-convert-cvs-detectmerge @ 9543:56a5f80556f5

convert/cvs: stop supporting external cvsps
author Patrick Mezard <pmezard@gmail.com>
date Mon, 05 Oct 2009 22:57:15 +0200
parents 1f0f01bc86a5
children
line wrap: on
line diff
--- a/tests/test-convert-cvs-detectmerge	Mon Oct 05 22:17:39 2009 +0200
+++ b/tests/test-convert-cvs-detectmerge	Mon Oct 05 22:57:15 2009 +0200
@@ -34,7 +34,6 @@
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
-echo "cvsps=builtin" >> $HGRCPATH
 echo "cvsps.cache=0" >> $HGRCPATH
 echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH