diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index bb2531536160bb0a6510cc316d8d74a1da2312e7..eab053c3e0e1cbe82bc7824d43109ba56acdb54d 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
# we assume the default git-am -3 --skip strategy is tested independently
# and always works :)
-if test "$no_python"; then
- echo "Skipping: no python => no recursive merge"
- test_done
- exit 0
-fi
-
test_expect_success setup '
echo hello > hello &&
git add hello &&
'
test_expect_success 'merge and reference trees equal' \
- 'test -z "`git-diff-tree skip-merge skip-reference`"'
+ 'test -z "`git diff-tree skip-merge skip-reference`"'
test_debug 'gitk --all & sleep 1'
test_done
-