diff -r 253d5c0f3a2f -r 4d019d0e1b3b mercurial/filemerge.py --- a/mercurial/filemerge.py Wed Feb 08 07:44:10 2017 -0800 +++ b/mercurial/filemerge.py Thu Feb 09 09:32:25 2017 -0800 @@ -489,6 +489,9 @@ args = util.interpolate(r'\$', replace, args, lambda s: util.shellquote(util.localpath(s))) cmd = toolpath + ' ' + args + if _toolbool(ui, tool, "gui"): + repo.ui.status(_('running merge tool %s for file %s\n') % + (tool, fcd.path())) repo.ui.debug('launching merge tool: %s\n' % cmd) r = ui.system(cmd, cwd=repo.root, environ=env) repo.ui.debug('merge tool returned: %s\n' % r)