mercurial/hg.py
changeset 44428 0f60687b2324
parent 44324 3245cdea2c63
child 44429 ddbc296a1f48
--- 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."""