mercurial/hg.py

--- a/mercurial/hg.py	Mon Aug 07 23:18:16 2006 -0500
+++ b/mercurial/hg.py	Mon Aug 07 23:53:04 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, allow=True, forcemerge=force,
+    return _merge.update(repo, node, branchmerge=True, forcemerge=force,
                          remind=remind, wlock=wlock)
 
 def revert(repo, node, choose):