equal
deleted
inserted
replaced
3585 displayer.close() |
3585 displayer.close() |
3586 return 0 |
3586 return 0 |
3587 |
3587 |
3588 try: |
3588 try: |
3589 # ui.forcemerge is an internal variable, do not document |
3589 # ui.forcemerge is an internal variable, do not document |
3590 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
3590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
3591 return hg.merge(repo, node, force=opts.get('force')) |
3591 return hg.merge(repo, node, force=opts.get('force')) |
3592 finally: |
3592 finally: |
3593 ui.setconfig('ui', 'forcemerge', '') |
3593 ui.setconfig('ui', 'forcemerge', '') |
3594 |
3594 |
3595 @command('outgoing|out', |
3595 @command('outgoing|out', |