# HG changeset patch # User Martin von Zweigbergk # Date 1582743257 28800 # Node ID 0f60687b2324ca80030ef06caeadfa3c65cdf4fb # Parent acbfa31cfaf282fbabbceab6b7ff98616b1f66f5 merge: change default of hg.merge()'s "force" argument from None to False The argument is only passed to `mergemode.update()`, and that function treats `None` just like `False`, so `False` seems clearer. Differential Revision: https://phab.mercurial-scm.org/D8166 diff -r acbfa31cfaf2 -r 0f60687b2324 mercurial/hg.py --- a/mercurial/hg.py Thu Feb 13 21:14:20 2020 -0800 +++ b/mercurial/hg.py Wed Feb 26 10:54:17 2020 -0800 @@ -1137,7 +1137,7 @@ def merge( - repo, node, force=None, remind=True, mergeforce=False, labels=None, + repo, node, force=False, remind=True, mergeforce=False, labels=None, ): """Branch merge with node, resolving changes. Return true if any unresolved conflicts."""