X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;h=0ab14a6e81302db6a1239d68270ab909cb2fd216;hb=71b0251cdd2cc35a983e21d4e71285db56d2a519;hp=8f7366da8d53feb95d08fd57c04b96c7bcbb9625;hpb=2dcb927f37976ef5185cef5452516b170b14cd6c;p=git.git

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 8f7366da8..0ab14a6e8 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
@@ -26,7 +20,7 @@ test_expect_success 'prepare repository' \
 7
 8
 9" > file &&
-git add file && 
+git add file &&
 git commit -m "Initial commit" file &&
 git branch A &&
 git branch B &&