D3492: tests: port test-simplemerge.py to Python 3

[indygreg (Gregory Szorc)]

indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.


  Phabricator's intra-line highlighting makes this so much easier to review than email or patchwork.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3492

To: durin42, pulkit, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel