From: Marcel Röthke <marcel@roethke.info>
Date: Sat, 06 Apr 2024 20:21:29 GMT
Subject: Re: segfault with git rebase --abort
Message-ID: <ZhGuyeJp28heaITM@roethke.info>
In-Reply-To: <xmqqfrwehweg.fsf@gitster.g>

On 2024-03-25 13:46:47, Junio C Hamano wrote:
> Wolfgang Rohdewald <wolfgang@rohdewald.de> writes:
> I think I forgot to remove one line of "<<<<<<< HEAD" before doing the first git add.

This was the missing piece in my reproduction attempts!
When you leave that line in and have another conflict in the same file
later in the rebase, rerere falls on its nose.

I will do some more poking and update my patch accordingly.