During merge I got a conflict on... the whole file XD The 'second half' has the CRLF endings in it. I use ~/.bazaar/rules to automatically convert line endings but it seems it's done *after* merging :(((
(I like better the svn:eol-style behaviour: line style is handled in the repository, not on checkout...) Is there some trick to avoid this? It impossible to do a merge this way! Would updating bzr help? (I'm still 2.4 so maybe it's a fixed problem) I'll try when I got time. -- 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
