diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-11 23:26:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 23:26:58 +0300 |
| commit | 076eeec8bec1df628717733fb16df6161d5ef7e5 (patch) | |
| tree | 962df7acb4d3334a5b7aba6c022feb2e06eb5a32 /t | |
| parent | 12deaf66d468c050eafc0033f96892409d7f6701 (diff) | |
| parent | 5fdacc17c7eb2a7b435d62d99b41f75f44f74de1 (diff) | |
Merge branch 'wd/rebase-conflict-guide'
The advice message given when "git rebase" stops for conflicting
changes has been improved.
* wd/rebase-conflict-guide:
rebase: make resolve message clearer for inexperienced users
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index f15f7a33296..59c4b778d3a 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -305,7 +305,7 @@ test_expect_success '--rebase with conflicts shows advice' ' test_tick && git commit -m "Create conflict" seq.txt && test_must_fail git pull --rebase . seq 2>err >out && - test_i18ngrep "When you have resolved this problem" out + test_i18ngrep "Resolve all conflicts manually" out ' test_expect_success 'failed --rebase shows advice' ' @@ -319,7 +319,7 @@ test_expect_success 'failed --rebase shows advice' ' git checkout -f -b fails-to-rebase HEAD^ && test_commit v2-without-cr file "2" file2-lf && test_must_fail git pull --rebase . diverging 2>err >out && - test_i18ngrep "When you have resolved this problem" out + test_i18ngrep "Resolve all conflicts manually" out ' test_expect_success '--rebase fails with multiple branches' ' |