merge: drop redundant mergeforce argument from hg.merge()...
merge: drop redundant mergeforce argument from hg.merge()
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 `force`.
Differential Revision:
https://phab.mercurial-scm.org/D8167