bbatsov/solarized-emacs — pull request #73 by phaebz (2013-07-24 22:45:31+00:00)
Title: Add ediff-*-C faces for three way ediff

This is a tentative enhancement for ediff-files3 or during magit merge conflicts to be resolved via the 'e' key, i.e. ediff.