diff -r 6e36b9fc7869 -r 96529f81e2e9 tests/test-convert-cvs-detectmerge.t --- a/tests/test-convert-cvs-detectmerge.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvs-detectmerge.t Sun Dec 28 21:30:52 2014 +0100 @@ -33,7 +33,6 @@ create cvs repository with one project - $ mkdir cvsrepo $ cvscall -q -d "$CVSROOT" init $ mkdir cvsrepo/proj