Add merge conflict seperator faces in diff view.
Merge commit 'ace86fd'
Merge commit '543b5db7ac0765b560d63ef136121752389dd386' into tarsius/master
Merge branch 'tarsius/master'