diff mercurial/merge.py @ 36478:a6e9a360ccd8

py3: use '%d' for integers instead of b'%s' Differential Revision: https://phab.mercurial-scm.org/D2502
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 28 Feb 2018 21:45:15 +0530
parents 035b77bf01d2
children 1d99260c3a81
line wrap: on
line diff