Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 8f7366da8d53feb95d08fd57c04b96c7bcbb9625..499cafb882b83b780171c8601b9f4c54b294ed43 100755 (executable)
--- 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