1. 2017-09-30 D857: py3: add a test showing a normal `hg merge` wor mercurial Pulkit Goyal 2. 2017-09-30 D857: py3: add a test showing a normal `hg merge` wor mercurial Augie Fackler 3. 2017-09-30 D857: py3: add a test showing a normal `hg merge` wor mercurial Pulkit Goyal