changeset 21525 | 559f01f19cf6 |
parent 21503 | 10f15e34d86c |
child 21541 | 6062593d8b06 |
--- a/mercurial/commands.py Thu May 08 16:54:23 2014 -0700 +++ b/mercurial/commands.py Fri May 09 18:15:02 2014 -0700 @@ -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