magit/magit — pull request #610 by artagnon (2013-04-02 13:19:49+00:00)
Title: magit.el: introduce magit-diff-merge-diff3-separator face

Setting merge.conflictstyle to diff3 introduces a new kind of conflict
marker separator. Give it a face of its own.

Signed-off-by: Ramkumar Ramachandra