From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2022 19:52:53 +0000 (-0800)
Subject: Merge branch 'jz/apply-3-corner-cases'
X-Git-Tag: v2.35.0-rc0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc61dbac770923a96e2007c3de4027c5d11c6d41;p=thirdparty%2Fgit.git

Merge branch 'jz/apply-3-corner-cases'

"git apply --3way" bypasses the attempt to do a three-way
application in more cases to address the regression caused by the
recent change to use direct application as a fallback.

* jz/apply-3-corner-cases:
  git-apply: skip threeway in add / rename cases
---

bc61dbac770923a96e2007c3de4027c5d11c6d41