changeset 2824 | ca06d35af65e |
parent 2823 | 1c6beafbae97 |
child 2825 | 1ea086bc2086 |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -217,7 +217,7 @@ def clean(repo, node, wlock=None, show_s def merge(repo, node, force=None, remind=True, wlock=None): """branch merge with node, resolving changes""" - return _merge.update(repo, node, allow=True, forcemerge=force, + return _merge.update(repo, node, branchmerge=True, forcemerge=force, remind=remind, wlock=wlock) def revert(repo, node, choose):