Mercurial > hg
comparison mercurial/merge.py @ 35203:4ee493ea1c13
py3: use pycompat.bytestr() or '%d' in place of str()
Differential Revision: https://phab.mercurial-scm.org/D1556
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 29 Nov 2017 08:39:48 +0530 |
parents | a92b9f8e11ba |
children | 46510597d266 |
comparison
equal
deleted
inserted
replaced
35202:760fef6aca74 | 35203:4ee493ea1c13 |
---|