X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;fp=t%2Ft6021-merge-criss-cross.sh;h=499cafb882b83b780171c8601b9f4c54b294ed43;hb=36889a5078767be8cc0189c10d235dda327c6a30;hp=8f7366da8d53feb95d08fd57c04b96c7bcbb9625;hpb=019298015bb7c826b72f2573047b7221b0921fd3;p=git.git

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 8f7366da8..499cafb88 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -10,12 +10,6 @@
 test_description='Test criss-cross merge'
 . ./test-lib.sh
 
-if test "$no_python"; then
-	echo "Skipping: no python => no recursive merge"
-	test_done
-	exit 0
-fi
-
 test_expect_success 'prepare repository' \
 'echo "1
 2