diff --git a/mercurial/commands.py b/mercurial/commands.py index 47b97d9af27e0c521b11c8f9464a2d037851f827_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..559f01f19cf6b8054f010e51c0c958157e617f8b_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3178,7 +3178,8 @@ repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'graft') stats = mergemod.update(repo, ctx.node(), True, True, False, - ctx.p1().node()) + ctx.p1().node(), + labels=['local', 'graft']) finally: repo.ui.setconfig('ui', 'forcemerge', '', 'graft') # report any conflicts