magit/magit — pull request #431 by chrisdone (2012-06-23 12:12:38+00:00)
Title: Add merge conflict seperator faces in diff view

Because it looks nice.