From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 11 Jan 2007 09:46:51 GMT
Subject: Re: Bug-ish: CRLF endings and conflict markers
Message-ID: <Pine.LNX.4.63.0701111043440.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <200701110941.22024.andyparkins@gmail.com>

Hi,

On Thu, 11 Jan 2007, Andy Parkins wrote:

> [describes that conflict markers have LF-only line ending, even if file 
>  has CR-LF line endings]
> 
> The best solution is probably to use the line ending of the conflicted 
> lines.

Question is: how to find out. Especially if your file already has mixed 
line endings...

> I've had a look, but I can only fine builtin-rerere.c that generates the 
> markers - would that be the place to make this change?

No. It would be in xdiff/xmerge.c:{139,147,160}. But I think that xdiff 
really is LF-only throughout, so you'd have to do much more work anyway.

Ciao,
Dscho