X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;h=262381379f247a74f1656cfdd7f9b0c6d386d372;hb=9c7466fa248608ff8a91f8b4dca48dac7dda02d5;hp=e8606c751d6236ea7109359910a8e8adc01eb627;hpb=7057463463ad01266db264acf7e7b5e95e7b4ecf;p=git.git

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index e8606c75..26238137 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -10,6 +10,12 @@
 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