Re: Why did every line in w32fns.c get a ^M?

[Lennart Borgman]

On Thu, Jul 1, 2010 at 12:42 PM, Juanma Barranquero <address@hidden> wrote:
> On Thu, Jul 1, 2010 at 12:37, Lennart Borgman <address@hidden> wrote:
>
>> When I just updated I got a merge conflict in w32fns.c. At the same
>> time all the lines in that file got a ^M at the end.
>>
>> Why did they get that? (This is on w32.)
>
> Did you have local changes on w32fns.c? Perhaps you mixed CRLF vs LF.
> Have you tried reverting the file?


I have a lot of changes there, but I don't think there were any mix of
CRLF vs LF.