From: Marius Storm-Olsen <marius@trolltech.com>
Date: Mon, 09 Jun 2008 19:44:27 GMT
Subject: Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only
Message-ID: <484D881B.1070400@trolltech.com>
In-Reply-To: <484D424C.3010002@trolltech.com>

Marius Storm-Olsen said the following on 09.06.2008 16:46:
> ... Then you commit. The end result is that 
> you have a workingdir with a mix of LF and CRLF files, which after 
> some more operations may trigger a "whole file changed" diff, due to 
> the workingdir file now having LF EOLs.

..actually, it's more like applying patches and cherry-picking then 
breaks when the touch the same file, if I recall correctly.

Thanks for all the pointers, I'll send an updated patch tomorrow.

--
.marius