summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
-rwxr-xr-xt/t6021-merge-criss-cross.sh6
1 files changed, 0 insertions, 6 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 8f7366da8d..499cafb882 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