diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:38:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:38:16 (GMT) |
| commit | c9cae1e28a050f115d7591ce1a68674c2067b54b (patch) | |
| tree | fba2d3e25ade64bef99f0093a8078c751eb12e84 /t | |
| parent | f79467ef364eb06ee9b49344cdec02e2bd1f2cc7 (diff) | |
| parent | 1306321ebea4d789974f0d58062664cc35c411e8 (diff) | |
| download | git-c9cae1e28a050f115d7591ce1a68674c2067b54b.zip git-c9cae1e28a050f115d7591ce1a68674c2067b54b.tar.gz git-c9cae1e28a050f115d7591ce1a68674c2067b54b.tar.bz2 | |
Merge branch 'fc/show-branch-in-rebase-am' into maint
* fc/show-branch-in-rebase-am:
prompt: fix for simple rebase
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 083b319..15521cc 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -276,7 +276,7 @@ test_expect_success 'prompt - rebase merge' ' ' test_expect_success 'prompt - rebase' ' - printf " ((t2)|REBASE 1/3)" > expected && + printf " (b2|REBASE 1/3)" > expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase b1 b2 && |