changeset 2815 | 4870f795f681 |
parent 2812 | 3aeab7bb5adc |
child 2830 | 49988d9f0758 |
--- a/mercurial/hg.py Tue Aug 08 10:35:19 2006 -0500 +++ b/mercurial/hg.py Tue Aug 08 10:56:48 2006 -0500 @@ -217,7 +217,7 @@ def merge(repo, node, force=None, remind=True, wlock=None): """branch merge with node, resolving changes""" - return _merge.update(repo, node, branchmerge=True, forcemerge=force, + return _merge.update(repo, node, branchmerge=True, force=force, remind=remind, wlock=wlock) def revert(repo, node, choose, wlock):