From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 07 Jul 2008 13:02:20 GMT
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Message-ID: <alpine.DEB.1.00.0807071400180.18205@racer>
In-Reply-To: <1215434568-30456-1-git-send-email-dkr+ml.git@free.fr>

Hi,

On Mon, 7 Jul 2008, Olivier Marin wrote:

> From: Olivier Marin <dkr@freesurf.fr>
> 
> When a conflicting file contains a line that begin with "=======", rerere
> failed to parse conflict markers. This result to a wrong preimage file and
> an unexpected error for the user.
> 
> This patch enforce parsing rules so that markers match in the right order
> and update tests to match the above fix.

So what about

	<<<<<<< This hunk contains =====
	anythin
	=======

	Hello
	=======
	somethin else
	>>>>>>> problem!


If you fix it, I think you should do it properly, and analyze the index.

Ciao,
Dscho