mercurial/merge.py

3246:27139167e615

    updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)

    # update dirstate
    if not partial:
        repo.dirstate.setparents(p1.node(), p2.node())
        recordupdates(repo, action, branchmerge)

    if show_stats:
        stats = ((updated, _("updated")),
                 (merged - unresolved, _("merged")),
                 (removed, _("removed")),

3247:7a0d70b69d74

    updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)

    # update dirstate
    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(p1.node(), p2.node())

    if show_stats:
        stats = ((updated, _("updated")),
                 (merged - unresolved, _("merged")),
                 (removed, _("removed")),