mercurial/commands.py

6843:b114a8c7998f

    if not node:
        node = rev

    if not node:
        branch = repo.changectx(None).branch()
        bheads = repo.branchheads()
        if len(bheads) > 2:
            raise util.Abort(_("branch '%s' has %d heads - "
                               "please merge with an explicit rev") %
                             (branch, len(bheads)))

6844:a38dff85d31f

    if not node:
        node = rev

    if not node:
        branch = repo.changectx(None).branch()
        bheads = repo.branchheads(branch)
        if len(bheads) > 2:
            raise util.Abort(_("branch '%s' has %d heads - "
                               "please merge with an explicit rev") %
                             (branch, len(bheads)))