diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
| commit | 076eeec8bec1df628717733fb16df6161d5ef7e5 (patch) | |
| tree | 962df7acb4d3334a5b7aba6c022feb2e06eb5a32 /builtin/merge.c | |
| parent | Merge branch 'rs/stat-data-unaligned-reads-fix' (diff) | |
| parent | rebase: make resolve message clearer for inexperienced users (diff) | |
| download | tgif-076eeec8bec1df628717733fb16df6161d5ef7e5.tar.xz | |
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions