kicad-developers team mailing list archive

[Lorenzo Marcantonio <l.marcantonio@xxxxxxxxxxxx>]

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

http://wiki.bazaar.canonical.com/fjalvingh

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