X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3402-rebase-merge.sh;h=0779aaa9aba16f0f8502505b4df5cc49cfe8af82;hb=4340a813d007b592534de664d152d66417dbe809;hp=d34c6cf6f3143bac81b69f79329d2d893e379c39;hpb=67e31d6234c0332334d7aedd70b2f101bc010cf9;p=git.git diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index d34c6cf6f..0779aaa9a 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -7,12 +7,6 @@ test_description='git rebase --merge test' . ./test-lib.sh -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - T="A quick brown fox jumps over the lazy dog." for i in 1 2 3 4 5 6 7 8 9 10