Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git]
/
t
/
t9603-cvsimport-patchsets.sh
diff --git
a/t/t9603-cvsimport-patchsets.sh
b/t/t9603-cvsimport-patchsets.sh
index 958bdce4dd8891fa648ba2bf554b18cae91de712..93c4fa885eeff16c57a58d8dc4fa7537cde54ea9 100755
(executable)
--- a/
t/t9603-cvsimport-patchsets.sh
+++ b/
t/t9603-cvsimport-patchsets.sh
@@
-14,8
+14,7
@@
test_description='git cvsimport testing for correct patchset estimation'
. ./lib-cvs.sh
-CVSROOT="$TEST_DIRECTORY"/t9603/cvsroot
-export CVSROOT
+setup_cvs_test_repository t9603
test_expect_failure 'import with criss cross times on revisions' '