From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Apr 2021 20:36:00 +0000 (-0700)
Subject: Merge branch 'jz/apply-run-3way-first'
X-Git-Tag: v2.32.0-rc0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=771c758e8a89d4d7aa482e7f98d8878214630301;p=thirdparty%2Fgit.git

Merge branch 'jz/apply-run-3way-first'

"git apply --3way" has always been "to fall back to 3-way merge
only when straight application fails". Swap the order of falling
back so that 3-way is always attempted first (only when the option
is given, of course) and then straight patch application is used as
a fallback when it fails.

* jz/apply-run-3way-first:
  git-apply: try threeway first when "--3way" is used
---

771c758e8a89d4d7aa482e7f98d8878214630301