Merge branch 'rr/cvsexportcommit'

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index bb2531536160bb0a6510cc316d8d74a1da2312e7..977c498f00f2d8e2066bd586130ee84fe1a196a3 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -10,12 +10,6 @@ test_description='git rebase --merge --skip tests'
 # we assume the default git-am -3 --skip strategy is tested independently
 # and always works :)
 
-if test "$no_python"; then
-       echo "Skipping: no python => no recursive merge"
-       test_done
-       exit 0
-fi
-
 test_expect_success setup '
        echo hello > hello &&
        git add hello &&