diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:14 -0800 |
| commit | 098ed50e8a7c581e23cd51b737fb780228fe6f31 (patch) | |
| tree | 708d472f3b40ea250e0c14d28005487614e91ada /t/t3404-rebase-interactive.sh | |
| parent | a04855bae8d75d22b0c909c7d1febedcd05ba9b1 (diff) | |
| parent | 18633e1a22a68bbe8e6311a1039d13ebbf6fd041 (diff) | |
| download | git-098ed50e8a7c581e23cd51b737fb780228fe6f31.tar.gz | |
Merge branch 'js/rebase-helper'
"git rebase -i" starts using the recently updated "sequencer" code.
* js/rebase-helper:
rebase -i: use the rebase--helper builtin
rebase--helper: add a builtin helper for interactive rebases
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index e2f18d11f6..33d392ba11 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -556,7 +556,7 @@ test_expect_success 'clean error after failed "exec"' ' echo "edited again" > file7 && git add file7 && test_must_fail git rebase --continue 2>error && - test_i18ngrep "You have staged changes in your working tree." error + test_i18ngrep "you have staged changes in your working tree" error ' test_expect_success 'rebase a detached HEAD' ' |