From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Sep 2021 18:46:19 +0000 (-0700)
Subject: Merge branch 'zh/cherry-pick-advice'
X-Git-Tag: v2.34.0-rc0~197
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=173368d73da792663358dea5b878cc822511001e;p=thirdparty%2Fgit.git

Merge branch 'zh/cherry-pick-advice'

The advice message that "git cherry-pick" gives when it asks
conflicted replay of a commit to be resolved by the end user has
been updated.

* zh/cherry-pick-advice:
  cherry-pick: use better advice message
---

173368d73da792663358dea5b878cc822511001e