# HG changeset patch
# User Simon Farnsworth <simonfar@fb.com>
# Date 1488799180 28800
# Node ID 84e8a68342233039e56dcde08f066a86c940012b
# Parent  a8e4322f64c1395672b4a8cbb166b51f93194a41
filemerge: tag merge tool for blocked times

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

diff -r a8e4322f64c1 -r 84e8a6834223 mercurial/filemerge.py
--- 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