Re: [boost] svnmerge woes

Eric Niebler wrote:

All I'm trying to do is merge from trunk. I shouldn't have to edit files by hand, IMO.

Sure, but somehow you've ended up with mixed \n and \r\n line endings, and that's really not something you should be checking in IMO. As for why the file ended up that way, that's a whole other issue... John.