Mercurial > hg
comparison mercurial/wireprototypes.py @ 44398:ddbc296a1f48
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 11:00:50 -0800 |
| parents | f5fcf7123a92 |
| children | 9d2b2df2c2ba |
comparison
equal
deleted
inserted
replaced
| 44397:0f60687b2324 | 44398:ddbc296a1f48 |
|---|