Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: sv.po: Update Swedish translation (3288t0f0u)
[gitweb.git]
/
t
/
t3418-rebase-continue.sh
diff --git
a/t/t3418-rebase-continue.sh
b/t/t3418-rebase-continue.sh
index 2b746f1559ad21a5ebf3bebd726c9a1b3d071c5a..fcfdd197bd352a9dca10233c2ba6d2aa4a66149e 100755
(executable)
--- a/
t/t3418-rebase-continue.sh
+++ b/
t/t3418-rebase-continue.sh
@@
-141,5
+141,8
@@
test_rerere_autoupdate () {
test_rerere_autoupdate
test_rerere_autoupdate -m
+GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
+test_rerere_autoupdate -i
+test_rerere_autoupdate --preserve-merges
test_done