hgext/__init__.py

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

from __future__ import absolute_import
import pkgutil

__path__ = pkgutil.extend_path(__path__, __name__)