diff tests/test-merge5.t @ 35204:d4b108fdf423

py3: use encoding.strtolocal() to convert string to bytes Differential Revision: https://phab.mercurial-scm.org/D1557
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 29 Nov 2017 08:40:25 +0530
parents 6b1fc09c699a
children 527ce85c2e60
line wrap: on
line diff