diff mercurial/filemerge.py @ 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 5caae380ff90
children 010179e21e91
line wrap: on
line diff