Enhance merge conflict editor UI

There are lots of cool three-way diff tools. It would be hard work, but it would be awesome if we could replicate one of these.

Some examples: https://www.git-tower.com/blog/diff-tools-mac

And here's what Meld looks like: