From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Jul 2021 01:06:20 GMT
Subject: Re: [PATCH] ll-merge: teach ll_binary_merge() a trivial three-way merge
Message-ID: <xmqqczr26i9f.fsf@gitster.g>
In-Reply-To: <CABPp-BFh3uV9-X8iaKHA771TUneBDYmOKU5+5y9XsE-11UL7tQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> It appears that try_threeway() in apply.c is already computing the
> OIDs of the blobs involved, so it looks like the full content
> comparison is unnecessary even in the apply --3way case.  If we moved
> the trivial-merge check to that function, it could just compare the
> OIDs rather than comparing the full content.

Yeah, if we trust merge backends and only fix "apply --3way"
codepath, which I actually am OK with, I agree that it would be
vastly simpler and nicer to do it in try_threeway().

Thanks.