changeset 44397:0f60687b2324

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
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 26 Feb 2020 10:54:17 -0800
parents acbfa31cfaf2
children ddbc296a1f48
files mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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."""