From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:26:58 +0000 (-0700)
Subject: Merge branch 'wd/rebase-conflict-guide'
X-Git-Tag: v2.15.0-rc0~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=076eeec8bec1df628717733fb16df6161d5ef7e5;p=thirdparty%2Fgit.git

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
---

076eeec8bec1df628717733fb16df6161d5ef7e5