X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;h=499cafb882b83b780171c8601b9f4c54b294ed43;hb=9299c4f147bcff603eef187eb04fe38153571d30;hp=262381379f247a74f1656cfdd7f9b0c6d386d372;hpb=b642d9ef643371990c0a921836f2a074d48ce1b3;p=git.git

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 262381379..499cafb88 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -4,18 +4,12 @@
 #
 
 # See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
-# nice decription of what this is about.
+# nice description of what this is about.
 
 
 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