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 <artagnon@gmail.com>