not impressed with Merge Conflict Editor, would be a lot better as visual diff with two versions next to each other (ala meld), not to mention arrow buttons to

not impressed with Merge Conflict Editor, would be a lot better as visual diff with two versions next to each other (ala meld), not to mention arrow buttons to quickly pick version without touching text.