diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 0779aaa9a..d34c6cf6f 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -7,6 +7,12 @@ 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 |