Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 13162:115a9760c382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: document some internal return values.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 13 Dec 2010 11:46:31 -0500
parents 6c375e07d673
children 3bbbde6f3e9f
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Dec 16 14:50:37 2010 -0600
+++ b/mercurial/hg.py	Mon Dec 13 11:46:31 2010 -0500
@@ -395,7 +395,8 @@
     return stats[3] > 0
 
 def merge(repo, node, force=None, remind=True):
-    """branch merge with node, resolving changes"""
+    """Branch merge with node, resolving changes. Return true if any
+    unresolved conflicts."""
     stats = mergemod.update(repo, node, True, force, False)
     _showstats(repo, stats)
     if stats[3]: