Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
34505:91250ff7d48a 34506:1d804c22c671
513 if _toolbool(ui, tool, "gui"): 513 if _toolbool(ui, tool, "gui"):
514 repo.ui.status(_('running merge tool %s for file %s\n') % 514 repo.ui.status(_('running merge tool %s for file %s\n') %
515 (tool, fcd.path())) 515 (tool, fcd.path()))
516 repo.ui.debug('launching merge tool: %s\n' % cmd) 516 repo.ui.debug('launching merge tool: %s\n' % cmd)
517 r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') 517 r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
518 repo.ui.debug('merge tool returned: %s\n' % r) 518 repo.ui.debug('merge tool returned: %d\n' % r)
519 return True, r, False 519 return True, r, False
520 finally: 520 finally:
521 util.unlink(b) 521 util.unlink(b)
522 util.unlink(c) 522 util.unlink(c)
523 523