Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
doc: promote "git restore"
[gitweb.git]
/
t
/
t9903-bash-prompt.sh
diff --git
a/t/t9903-bash-prompt.sh
b/t/t9903-bash-prompt.sh
index 81a5179e28bf529bc2f0a8bc197108fcb69fba72..5cadedb2a9bc6eb66b9ead3ccae037e62a655f2c 100755
(executable)
--- a/
t/t9903-bash-prompt.sh
+++ b/
t/t9903-bash-prompt.sh
@@
-180,7
+180,7
@@
test_expect_success 'prompt - interactive rebase' '
'
test_expect_success 'prompt - rebase merge' '
- printf " (b2|REBASE-
m
1/3)" >expected &&
+ printf " (b2|REBASE-
i
1/3)" >expected &&
git checkout b2 &&
test_when_finished "git checkout master" &&
test_must_fail git rebase --merge b1 b2 &&