Port the version control "Conflicts" section to Mercurial.

(cherry picked from commit cf8bd613a172227168e36b3722308c100bf0f14a)