Subject: Re: [PATCH v2] apply: resolve trivial merge without hitting ll-merge with "--3way"

From: Junio C Hamano <[email-masked]>
Date: Mon, 06 Sep 2021 19:32:50 -0700

Ævar Arnfjörð Bjarmason <[email-masked]> 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.