diff -r 8e805cf27caa -r 940c05b25b07 mercurial/commands.py --- a/mercurial/commands.py Wed Oct 05 15:28:34 2016 +0200 +++ b/mercurial/commands.py Fri Oct 07 08:51:50 2016 -0700 @@ -5532,7 +5532,9 @@ # ui.forcemerge is an internal variable, do not document repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') force = opts.get('force') - return hg.merge(repo, node, force=force, mergeforce=force) + labels = ['working copy', 'merge rev'] + return hg.merge(repo, node, force=force, mergeforce=force, + labels=labels) finally: ui.setconfig('ui', 'forcemerge', '', 'merge')