From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 May 2021 03:47:38 +0000 (+0900)
Subject: Merge branch 'jz/apply-3way-first-message-fix'
X-Git-Tag: v2.32.0-rc0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d99f31ddafb064795d1d8f9b9bd930296f7069e;p=thirdparty%2Fgit.git

Merge branch 'jz/apply-3way-first-message-fix'

When we swapped the order of --3way fallback, we forgot to adjust
the message we give when the first method fails and the second
method is attempted (which used to be "direct application failed
hence we try 3way", now it is the other way around).

* jz/apply-3way-first-message-fix:
  apply: adjust messages to account for --3way changes
---

6d99f31ddafb064795d1d8f9b9bd930296f7069e