D8167: merge: drop redundant mergeforce argument from hg.merge()

2020-02-26 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The only caller that passed a value for either `force` or `mergeforce` passed the same value for both, so let's simplify the interface by accepting only `forc

D8167: merge: drop redundant mergeforce argument from hg.merge()

2020-02-27 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 20357. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8167?vs=20343&id=20357 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8167/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8167: merge: drop redundant mergeforce argument from hg.merge()

2020-02-27 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHGddbc296a1f48: merge: drop redundant mergeforce argument from hg.merge() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8167?vs=20357&id=