Mercurial > hg-stable
changeset 31214:84e8a6834223
filemerge: tag merge tool for blocked times
Merge tools can take a while - let's ensure that they're appropriately tagged
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Mon, 06 Mar 2017 03:19:40 -0800 |
| parents | a8e4322f64c1 |
| children | a48c6ac5c13a |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Mar 06 03:27:52 2017 -0800 +++ b/mercurial/filemerge.py Mon Mar 06 03:19:40 2017 -0800 @@ -493,7 +493,7 @@ 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) + r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') repo.ui.debug('merge tool returned: %s\n' % r) return True, r, False