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 /config.c | |
| 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 'config.c')
0 files changed, 0 insertions, 0 deletions