From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 May 2024 20:47:30 GMT
Subject: Re: Chunk header @@@ counts wrong?
Message-ID: <xmqqfrv0c55p.fsf@gitster.g>
In-Reply-To: <xmqqmsp8c5d3.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

>> * 51 plus-space (new to v1 but already in v2) lines
>
> I think you failed to count three lines in v2 and merge result, they
> look like "<<< HEAD" "======" ">>> 8eec118"; new to v1 but already
> in v2 lines are 54, not 51, no?

Ah, I take that back.  These have ++ that are new relative to parent
#1 and parent #2 (i.e. only the tentative merge result has them).
So, yes, I think you are counting correctly.

Sorry, but I do not know what's counting the hunk length numbers in
today's code offhand, so I won't be digging it further for now.