[PATCH] filemerge: tag merge tool for blocked times

[Simon Farnsworth]

# HG changeset patch
# User Simon Farnsworth <simonfar at fb.com>
# Date 1488799180 28800
#      Mon Mar 06 03:19:40 2017 -0800
# Node ID bca31954883ec7ffd16ee940bb84f12f60d286c8
# Parent  b4cd912d7704cd976e1bee3a3c927e0e578ec88f
filemerge: tag merge tool for blocked times

Merge tools can take a while - let's ensure that they're appropriately tagged

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -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