diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -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."""