diff mercurial/simplemerge.py @ 40629:ab59cc71f80c

tests: fix bytes/str issue I introduced when adding this test # skip-blame just b prefixes for py3 Differential Revision: https://phab.mercurial-scm.org/D5271
author Augie Fackler <augie@google.com>
date Wed, 14 Nov 2018 10:15:28 -0500
parents e7aa113b14f7
children aaad36b88298
line wrap: on
line diff