Re: [TSVN] Big Lint-cleaning patch

At 09:24 17/12/2004 +0100, you wrote:

>Very strange. The stdafx.h file really has the conflict markers in it. But
>did you notice that the '=====' marker isn't on its own line?
>I guess that Subversion somehow wasn't sure if it should merge these
>changes so it created a conflict. But then the diff library saw that the
>merge could be done without a conflict and just merged them.

I think it's to do with the original file not having had a CRLF on the end
of the last line - which has confused the diffing.

No worries.

Cheers,

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Dec 18 10:49:17 2004