filemerge: make `_filemerge()` do both premerge and merge
This patch removes the `premerge` argument from `_filemerge()` and makes it do both the "premerge" and "merge" steps without the caller having to call it twice. Differential Revision: https://phab.mercurial-scm.org/D11859
Showing
- hgext/largefiles/overrides.py 2 additions, 4 deletionshgext/largefiles/overrides.py
- mercurial/filemerge.py 14 additions, 21 deletionsmercurial/filemerge.py
- tests/test-graft.t 0 additions, 2 deletionstests/test-graft.t
- tests/test-merge-criss-cross.t 0 additions, 2 deletionstests/test-merge-criss-cross.t
- tests/test-merge-tools.t 0 additions, 3 deletionstests/test-merge-tools.t
- tests/test-merge7.t 0 additions, 2 deletionstests/test-merge7.t
- tests/test-rename-merge2.t 0 additions, 54 deletionstests/test-rename-merge2.t
- tests/test-subrepo.t 0 additions, 2 deletionstests/test-subrepo.t
- tests/test-up-local-change.t 0 additions, 6 deletionstests/test-up-local-change.t
Loading
Please register or sign in to comment