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
Showing
- mercurial/commands.py 10 additions, 34 deletionsmercurial/commands.py
- mercurial/merge.py 1 addition, 13 deletionsmercurial/merge.py
- mercurial/mergestate.py 5 additions, 8 deletionsmercurial/mergestate.py
- tests/test-copy-move-merge.t 2 additions, 2 deletionstests/test-copy-move-merge.t
- tests/test-double-merge.t 2 additions, 2 deletionstests/test-double-merge.t
- tests/test-graft.t 3 additions, 4 deletionstests/test-graft.t
- tests/test-issue672.t 2 additions, 2 deletionstests/test-issue672.t
- tests/test-merge-commit.t 2 additions, 2 deletionstests/test-merge-commit.t
- tests/test-merge-criss-cross.t 1 addition, 2 deletionstests/test-merge-criss-cross.t
- tests/test-merge-force.t 18 additions, 18 deletionstests/test-merge-force.t
- tests/test-merge-halt.t 5 additions, 10 deletionstests/test-merge-halt.t
- tests/test-merge-types.t 12 additions, 12 deletionstests/test-merge-types.t
- tests/test-merge7.t 1 addition, 2 deletionstests/test-merge7.t
- tests/test-merge9.t 2 additions, 2 deletionstests/test-merge9.t
- tests/test-rename-merge1.t 2 additions, 2 deletionstests/test-rename-merge1.t
- tests/test-rename-merge2.t 55 additions, 82 deletionstests/test-rename-merge2.t
- tests/test-resolve.t 8 additions, 8 deletionstests/test-resolve.t
- tests/test-shelve.t 1 addition, 1 deletiontests/test-shelve.t
- tests/test-sparse-profiles.t 2 additions, 2 deletionstests/test-sparse-profiles.t
- tests/test-status-color.t 1 addition, 1 deletiontests/test-status-color.t
Loading
Please register or sign in to comment