Dealing with merge failures?

[Wowbagger]

When I am merging changes from another branch into my model, and the VCS (git) cannot automatically resolve the differences, it leaves CVS style conflict tags ("<<<<<","====",">>>>>") in the XMI file.

Is there any way for EA to handle presenting me those changes so that I can resolve them, rather than having to undo the merge, get the two versions of the files, import one, and compare it with the other?