[BUG] NEWS contains conflicts markers inside

Alexander Belchenko bialix at ukr.net
Sat Oct 21 10:32:43 BST 2006


There is conflict markers in file NEWS. annotate says it was introduced 
by revision from Robert Collins by 2006-10-16:

line 256: <<<<<<< TREE

line 308: =======

line 317: >>>>>>> MERGE-SOURCE


Conflict in text related to 0.10 release.

--
Alexander





More information about the bazaar mailing list