Mercurial > public > mercurial-scm > hg

diff mercurial/hg.py @ 2810:ca06d35af65e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents 1c6beafbae97
children 1ea086bc2086
line wrap: on
line diff
--- 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):