# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-02-26 18:54:17
# 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 --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1137,7 +1137,7 @@ def updatetotally(ui, repo, checkout, br
 
 
 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."""