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
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