Mercurial > hg

diff mercurial/filemerge.py @ 34506:1d804c22c671

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use '%d' for integers instead of '%s' Differential Revision: https://phab.mercurial-scm.org/D973
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 02 Oct 2017 04:48:06 +0530
parents 9c07cff039bc
children f21eecc64ace
line wrap: on
line diff
--- a/mercurial/filemerge.py	Mon Oct 02 04:46:17 2017 +0530
+++ b/mercurial/filemerge.py	Mon Oct 02 04:48:06 2017 +0530
@@ -515,7 +515,7 @@
                            (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)