Add ediff-*-C faces for three way ediff a la ediff-files3 or during magit merge conflict.
Merge pull request #73 from phaebz/master

Add ediff-*-C faces for three way ediff