mercurial/merge.py

26681:ca8170b5d370

        pas = [None]
        if ancestor is not None:
            pas = [repo[ancestor]]

        if node is None:
            rev, _mark, _act = destutil.destupdate(repo)
            node = repo[rev].node()

        overwrite = force and not branchmerge

26682:08b068240a1a

        pas = [None]
        if ancestor is not None:
            pas = [repo[ancestor]]

        if node is None:
            if (repo.ui.configbool('devel', 'all-warnings')
                    or repo.ui.configbool('devel', 'oldapi')):
                repo.ui.develwarn('update with no target')
            rev, _mark, _act = destutil.destupdate(repo)
            node = repo[rev].node()

        overwrite = force and not branchmerge