Make `hg log -G` output consistent & correct hash values in text.
Clean up section of merge conflict resolution using kdiff3 GUI tool.
Add spelling of path to Mercurial config file that works in gitbash.
Add explicit setting of Windows terminal colour mode.
Merge pull request #627 from douglatornell/hg-kdiff3

Clean up conflicts section re: using kdiff3 as GUI merge tool