From: Olivier Marin <dkr+ml.git@free.fr>
Date: Mon, 07 Jul 2008 14:44:41 GMT
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Message-ID: <48722BD9.4090406@free.fr>
In-Reply-To: <alpine.DEB.1.00.0807071505470.18205@racer>

Johannes Schindelin a écrit :
> 
> Okay, but then the obvious question is: what do you do about "<<<<<<" 
> lines that are not a marker?

The answer is the same.

> Same remark as before: if you fix rerere, why not do it properly?

If you have a better fix send a patch or at least give me some clues.

Olivier.