[Updated] D11856: mergestate: make `_resolve()` do both preresolve and resolve

[Alphare (Raphaël Gomès)]

This revision is now accepted and ready to land.
Alphare accepted this revision.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11856/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11856

To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211207/3596ad2d/attachment-0002.html>