Mercurial > hg
comparison mercurial/filemerge.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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 03 Dec 2021 13:53:02 -0800 |
parents | 6ce9ccfcac23 |
children | 921853391276 |
comparison
equal
deleted
inserted
replaced
48427:38941a28406a | 48428:c25a67cfc291 |
---|