Bazaar

  1. Bug #36399
  2. Comment #4

Comment 4 for bug 36399

Revision history for this message
John A Meinel (jameinel) wrote :

This bug still exists. We end up with:
foo
<<<<<<< TREE
baz=======
bar>>>>>>> MERGE-SOURCE

At the end of the file.

As mentioned, this is consistent with CVS, so I'm making the priority Low, and it shouldn't block 0.9