Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Cleanup Git logo and Git logo target generation
[gitweb.git]
/
t
/
t3402-rebase-merge.sh
diff --git
a/t/t3402-rebase-merge.sh
b/t/t3402-rebase-merge.sh
index 0779aaa9aba16f0f8502505b4df5cc49cfe8af82..d34c6cf6f3143bac81b69f79329d2d893e379c39 100755
(executable)
--- 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