view mercurial/cext/__init__.py @ 48428:c25a67cfc291

mergestate: make `_resolve()` do both preresolve and resolve

This patch removes the `preresolve` argument from `_resolve()` and
makes it do both the "preresolve" and "resolve" steps without the
caller having to call it twice.

Differential Revision: https://phab.mercurial-scm.org/D11856