Add merge conflict seperator faces in diff view

Because it looks nice.