HomePhabricator

mergestate: inline `_resolve()` into `resolve()`

Authored by martinvonz.

Description

mergestate: inline _resolve() into resolve()

The caller is now trivial, so the indirection is pointless.

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

Details