← Back to team overview

kicad-developers team mailing list archive

Still about CRLF handling in bzr...


It seems they have plans for changes in the rule behaviour:


In the meantime I found that simply ignoring the merged file created
by bzr and doing a 3-way with

merge file.BASE file.THIS file.OTHER

(merge is from rcs!) works really well. diff3 could be useful, too...

Lorenzo Marcantonio
Logos Srl