<hr /><i>anonymous claiming to be Joerg Sonnenberger added on 2010-10-15 13:59:32:</i><br />
I agree that the markers at the moment are less helpful. Would it make sense to make them real prefixes? E.g.

<verbatim>
<<<< Working copy (version: XXX)
...
==== Conflict from version YYY
....
>>> End of conflict between XXX and YYY
</verbatim>

Would that break any tools for conflict resolution?