py3: use '%d' for integers instead of '%s'

Differential Revision: https://phab.mercurial-scm.org/D973

mercurial/filemerge.py

@@ -515,7 +515,7 b' def _xmerge(repo, mynode, orig, fcd, fco'
                            (tool, fcd.path()))
         repo.ui.debug('launching merge tool: %s\n' % cmd)
         r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
-        repo.ui.debug('merge tool returned: %s\n' % r)
+        repo.ui.debug('merge tool returned: %d\n' % r)
         return True, r, False
     finally:
         util.unlink(b)

mercurial/mdiff.py

@@ -457,7 +457,7 b' def b85diff(to, tn):'
     # TODO: deltas
     ret = []
     ret.append('GIT binary patch\n')
-    ret.append('literal %s\n' % len(tn))
+    ret.append('literal %d\n' % len(tn))
     for l in chunk(zlib.compress(tn)):
         ret.append(fmtline(l))
     ret.append('\n')