Things like "<<<<<<< TREE" should not creep into the diff - they are Bazaar conflict markers, which the conflict should be resolved before committing. The code in its current state is not workable.
See http://doc.bazaar.canonical.com/beta/en/user-guide/resolving_conflicts.html for information on resolving conflicts.
« Back to merge proposal
Things like "<<<<<<< TREE" should not creep into the diff - they are Bazaar conflict markers, which the conflict should be resolved before committing. The code in its current state is not workable.
See http:// doc.bazaar. canonical. com/beta/ en/user- guide/resolving _conflicts. html for information on resolving conflicts.