[lord_quas]

You could just use magit, right?

[codemac]

I started implementing some of it into magit, but I could never get magit + ediff working in a way I liked more than just invoking ediff myself.

Knowing the thorougness of magit, there's probably a way to successfully do this with minimal customization.