It would be nice if the conflict markers in merge results looked like:

<verbatim>
>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
<my version>
======================================
<your version>
>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
</verbatim>

Sometimes it's not clear where one parts ends an another one starts, especially when merging branches after the development has diverged for a while.