Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 44429: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 | 0f60687b2324 |
| children | a45ffad9ae98 |
line wrap: on
line diff
--- a/mercurial/hg.py Wed Feb 26 10:54:17 2020 -0800 +++ b/mercurial/hg.py Wed Feb 26 11:00:50 2020 -0800 @@ -1137,7 +1137,7 @@ def merge( - repo, node, force=False, remind=True, mergeforce=False, labels=None, + repo, node, force=False, remind=True, labels=None, ): """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" @@ -1146,7 +1146,7 @@ node, branchmerge=True, force=force, - mergeforce=mergeforce, + mergeforce=force, labels=labels, ) _showstats(repo, stats)