Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Revert "t/lib-git-daemon: record daemon log"
[gitweb.git]
/
t
/
t3411-rebase-preserve-around-merges.sh
diff --git
a/t/t3411-rebase-preserve-around-merges.sh
b/t/t3411-rebase-preserve-around-merges.sh
index dc81bf27eb736d32df0f0c3205de3254898d20b5..fb45e7bf7bd638314b67d593327474cea06be9bb 100755
(executable)
--- a/
t/t3411-rebase-preserve-around-merges.sh
+++ b/
t/t3411-rebase-preserve-around-merges.sh
@@
-10,6
+10,11
@@
a merge to before the merge.
'
. ./test-lib.sh
+if ! test_have_prereq REBASE_P; then
+ skip_all='skipping git rebase -p tests, as asked for'
+ test_done
+fi
+
. "$TEST_DIRECTORY"/lib-rebase.sh
set_fake_editor