Show More
@@ -489,6 +489,9 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||||
489 | args = util.interpolate(r'\$', replace, args, |
|
489 | args = util.interpolate(r'\$', replace, args, | |
490 | lambda s: util.shellquote(util.localpath(s))) |
|
490 | lambda s: util.shellquote(util.localpath(s))) | |
491 | cmd = toolpath + ' ' + args |
|
491 | cmd = toolpath + ' ' + args | |
|
492 | if _toolbool(ui, tool, "gui"): | |||
|
493 | repo.ui.status(_('running merge tool %s for file %s\n') % | |||
|
494 | (tool, fcd.path())) | |||
492 | repo.ui.debug('launching merge tool: %s\n' % cmd) |
|
495 | repo.ui.debug('launching merge tool: %s\n' % cmd) | |
493 | r = ui.system(cmd, cwd=repo.root, environ=env) |
|
496 | r = ui.system(cmd, cwd=repo.root, environ=env) | |
494 | repo.ui.debug('merge tool returned: %s\n' % r) |
|
497 | repo.ui.debug('merge tool returned: %s\n' % r) |
General Comments 0
You need to be logged in to leave comments.
Login now