Add merge conflict seperator faces in diff view.
Merge commit 'ace86fd'
Merge branch 'master' into next