Show More
| @@ -493,7 +493,7 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||
|
|
493 | 493 | repo.ui.status(_('running merge tool %s for file %s\n') % |
|
|
494 | 494 | (tool, fcd.path())) |
|
|
495 | 495 | repo.ui.debug('launching merge tool: %s\n' % cmd) |
|
|
496 | r = ui.system(cmd, cwd=repo.root, environ=env) | |
|
|
496 | r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') | |
|
|
497 | 497 | repo.ui.debug('merge tool returned: %s\n' % r) |
|
|
498 | 498 | return True, r, False |
|
|
499 | 499 | |
General Comments 0
You need to be logged in to leave comments.
Login now