5530 |
5530 |
5531 try: |
5531 try: |
5532 # ui.forcemerge is an internal variable, do not document |
5532 # ui.forcemerge is an internal variable, do not document |
5533 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
5533 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
5534 force = opts.get('force') |
5534 force = opts.get('force') |
5535 return hg.merge(repo, node, force=force, mergeforce=force) |
5535 labels = ['working copy', 'merge rev'] |
|
5536 return hg.merge(repo, node, force=force, mergeforce=force, |
|
5537 labels=labels) |
5536 finally: |
5538 finally: |
5537 ui.setconfig('ui', 'forcemerge', '', 'merge') |
5539 ui.setconfig('ui', 'forcemerge', '', 'merge') |
5538 |
5540 |
5539 @command('outgoing|out', |
5541 @command('outgoing|out', |
5540 [('f', 'force', None, _('run even when the destination is unrelated')), |
5542 [('f', 'force', None, _('run even when the destination is unrelated')), |