Submitter | phabricator |
---|---|
Date | Feb. 26, 2020, 7:14 p.m. |
Message ID | <differential-rev-PHID-DREV-xcwtjkd3anf25f6eyvn5-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/45348/ |
State | Superseded |
Headers | show |
Comments
Patch
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."""