> As far as there is: > - a easy way to ask bzr what files are in conflict, bzr status or bzr conflicts > - a simple way to handle the conflicts (automatic will be even > better), Use meld or something if you want it automatic (well, as automatic as it gets). > - no cleaning to do afterwards. bzr resolve will clean for you. > I'll be happy :) Be happy :) /Erik