On Mon, Jun 04, 2012 at 09:27:13AM -0500, Dick Hollenbeck wrote: > So don't let is cost you any sleep, just always have that pristine checkout > branch. > Besides we might need it someday if launchpad ever gets hacked. We would > need a number of > copies elsewhere > 0.
Bah. Didn't work. Just did a manual 3-way merge with the .BASE .THIS .OTHER files. All this work for a 1 liner XD It seems that it do the EOL filtering just before *writing* the files, not before the merge. The .OTHER file hadn't CRLFs, in fact. /me still prefers svn (but, anyway, even svn has its idiocy moments...) -- Lorenzo Marcantonio Logos Srl _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
