Comment 1 for bug 318919

Considering the conflicting text may come from many revisions and have many authors, it does not seem that this change could be made without breaking compatibility with existing tools. It could easily make the conflict hard to read, too.

In the end, what you want is annotation of the merge conflict. We already have annotation support in bzr, bzr-gtk and qbzr.