HomePhabricator

tests: add `hg log -G` output when there are merge conflicts

Authored by martinvonz.

Description

tests: add hg log -G output when there are merge conflicts

The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.

Differential Revision: https://phab.mercurial-scm.org/D8042

Details