Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 36508: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 | 7b84b737352d |
| children | f7e3fe95b663 |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Feb 28 21:44:28 2018 +0530 +++ b/hgext/rebase.py Wed Feb 28 21:45:15 2018 +0530 @@ -1036,7 +1036,7 @@ return nullrev if len(parents) == 1: return parents.pop() - raise error.Abort(_('unable to collapse on top of %s, there is more ' + raise error.Abort(_('unable to collapse on top of %d, there is more ' 'than one external parent: %s') % (max(destancestors), ', '.join("%d" % p for p in sorted(parents))))