magit/magit — pull request #1429 by tarsius (2014-07-16 15:30:03+00:00)
Title: New shiny Ediff integration

(I will try to later provide some details here and/or at https://github.com/magit/magit/wiki/FAQ)