manifestmerge: pass in branchmerge and force separately
This will be used in an upcoming patch.
Showing
- hgext/largefiles/overrides.py 4 additions, 2 deletionshgext/largefiles/overrides.py
- mercurial/merge.py 6 additions, 5 deletionsmercurial/merge.py
- tests/test-copy-move-merge.t 1 addition, 1 deletiontests/test-copy-move-merge.t
- tests/test-double-merge.t 1 addition, 1 deletiontests/test-double-merge.t
- tests/test-graft.t 3 additions, 3 deletionstests/test-graft.t
- tests/test-issue1802.t 1 addition, 1 deletiontests/test-issue1802.t
- tests/test-issue522.t 1 addition, 1 deletiontests/test-issue522.t
- tests/test-issue672.t 3 additions, 3 deletionstests/test-issue672.t
- tests/test-largefiles.t 1 addition, 1 deletiontests/test-largefiles.t
- tests/test-merge-commit.t 2 additions, 2 deletionstests/test-merge-commit.t
- tests/test-merge-types.t 3 additions, 3 deletionstests/test-merge-types.t
- tests/test-merge7.t 1 addition, 1 deletiontests/test-merge7.t
- tests/test-rename-dir-merge.t 2 additions, 2 deletionstests/test-rename-dir-merge.t
- tests/test-rename-merge1.t 2 additions, 2 deletionstests/test-rename-merge1.t
- tests/test-rename-merge2.t 21 additions, 21 deletionstests/test-rename-merge2.t
- tests/test-subrepo.t 4 additions, 4 deletionstests/test-subrepo.t
- tests/test-up-local-change.t 4 additions, 4 deletionstests/test-up-local-change.t
- tests/test-update-reverse.t 1 addition, 1 deletiontests/test-update-reverse.t
Loading
Please register or sign in to comment