mercurial/commands.py

16844:a7ba57b10530

                    # ui.forcemerge is an internal variable, do not document
                    repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                    stats = mergemod.update(repo, ctx.node(), True, True, False,
                                            ctx.p1().node())
                finally:
                    ui.setconfig('ui', 'forcemerge', '')
                # drop the second merge parent
                repo.setparents(current.node(), nullid)
                repo.dirstate.write()
                # fix up dirstate for copies and renames
                cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())

16850:9c86ef980d9e

                    # ui.forcemerge is an internal variable, do not document
                    repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                    stats = mergemod.update(repo, ctx.node(), True, True, False,
                                            ctx.p1().node())
                finally:
                    repo.ui.setconfig('ui', 'forcemerge', '')
                # drop the second merge parent
                repo.setparents(current.node(), nullid)
                repo.dirstate.write()
                # fix up dirstate for copies and renames
                cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())