projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
rev-list --bisect: limit list before bisecting.
[git.git]
/
t
/
t6021-merge-criss-cross.sh
diff --git
a/t/t6021-merge-criss-cross.sh
b/t/t6021-merge-criss-cross.sh
index
e8606c7
..
2623813
100755
(executable)
--- a/
t/t6021-merge-criss-cross.sh
+++ b/
t/t6021-merge-criss-cross.sh
@@
-10,6
+10,12
@@
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