equal
deleted
inserted
replaced
647 try: |
647 try: |
648 # ui.forcemerge is an internal variable, do not document |
648 # ui.forcemerge is an internal variable, do not document |
649 repo.ui.setconfig( |
649 repo.ui.setconfig( |
650 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' |
650 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' |
651 ) |
651 ) |
652 stats = mergemod.graft(repo, ctx, ctx.p1(), [b'local', b'histedit']) |
652 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) |
653 finally: |
653 finally: |
654 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') |
654 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') |
655 return stats |
655 return stats |
656 |
656 |
657 |
657 |