[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Juanma Barranquero
Subject: Re: Why did every line in w32fns.c get a ^M?
Date: Thu, 1 Jul 2010 13:46:44 +0200

On Thu, Jul 1, 2010 at 13:36, Lennart Borgman <address@hidden> wrote:

> But it looks like w32fns.c somehow got saved with CRLF line endings (I
> have no idea why)

I don't think it was Bazaar, so you're the likely culprit somehow... :-)

> and it looks like bzr merge could not handle that at all.

How could it? If the local copy suddenly has CRLF in every line, *all*
lines have changed and it has no anchors to detect where to apply
incoming changes.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]