diff -r 11eb53464e68 -r 115a9760c382 mercurial/hg.py
--- 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]: