Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 30062:940c05b25b07
merge: add conflict labels to merge command
Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Fri, 07 Oct 2016 08:51:50 -0700 |
| parents | cd7276f7ea83 |
| children | b24804f72116 |
line wrap: on
line diff
--- 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')