Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 2815:4870f795f681

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: combine force and forcemerge arguments
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 10:56:48 -0500
parents 3aeab7bb5adc
children 49988d9f0758
line wrap: on
line diff
--- 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):