From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:44 +0000 (-0700)
Subject: Merge branch 'jc/trivial-threeway-binary-merge' into maint
X-Git-Tag: v2.33.1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a7648a5e0968c25bd7a0b9ff9103f920c19a8d;p=thirdparty%2Fgit.git

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

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"
---

62a7648a5e0968c25bd7a0b9ff9103f920c19a8d