From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Sep 2021 20:15:26 +0000 (-0700)
Subject: Merge branch 'jc/trivial-threeway-binary-merge'
X-Git-Tag: v2.34.0-rc0~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c76fcf3e46a86d389739b7ee94b3d4faa351af84;p=thirdparty%2Fgit.git

Merge branch 'jc/trivial-threeway-binary-merge'

The "git apply -3" code path learned not to bother the lower level
merge machinery when the three-way merge can be trivially resolved
without the content level merge.

* jc/trivial-threeway-binary-merge:
  apply: resolve trivial merge without hitting ll-merge with "--3way"
---

c76fcf3e46a86d389739b7ee94b3d4faa351af84