summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-27 14:29:55 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-27 14:29:55 -0700
commit36889a5078767be8cc0189c10d235dda327c6a30 (patch)
tree84275b41ab53dd6b81bbf2cab25f70d221989be1 /t/t3402-rebase-merge.sh
parent019298015bb7c826b72f2573047b7221b0921fd3 (diff)
downloadgit-36889a5078767be8cc0189c10d235dda327c6a30.tar.gz
tests: merge-recursive is usable without Python
Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3402-rebase-merge.sh')
-rwxr-xr-xt/t3402-rebase-merge.sh6
1 files changed, 0 insertions, 6 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index d34c6cf6f3..0779aaa9ab 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -7,12 +7,6 @@ test_description='git rebase --merge test'
. ./test-lib.sh
-if test "$no_python"; then
- echo "Skipping: no python => no recursive merge"
- test_done
- exit 0
-fi
-
T="A quick brown fox
jumps over the lazy dog."
for i in 1 2 3 4 5 6 7 8 9 10