The new browse tool (see on wikipedia) can probably be adapted to use as the merge user interface.
Description
Description
Event Timeline
Comment Actions
I saw the interactive history browser and immediately thought of MABS conflict resolution need. I think it would allow us to pinpoint conflicting edits and make them visible to the user quickly. Edits that have been applied without problem would be marked normally. Edits that conflict would be bright red.