Skip to content
Snippets Groups Projects
Commit 38941a28406a authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

mergestate: merge `preresolve()` into `resolve()`

The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.

Differential Revision: https://phab.mercurial-scm.org/D11855
parent de8181c5414d
No related merge requests found
Showing
with 135 additions and 209 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment