From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 07 Sep 2021 02:32:50 GMT
Subject: Re: [PATCH v2] apply: resolve trivial merge without hitting ll-merge with "--3way"
Message-ID: <xmqqo895cdyl.fsf@gitster.g>
In-Reply-To: <87pmtlnyu7.fsf@evledraar.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Sun, Sep 05 2021, Junio C Hamano wrote:
>
>> +	if (!image->buf || type != OBJ_BLOB)
>> +		die("unable to read blob object %s", oid_to_hex(result_id));
>
> This die() message seems to only be applicable to the first condition
> here, shouldn't this be:

As this directly was lifted from read_mmblob(), it should be exactly
spelled as I wrote.