diff -r 54fa628b8c78 -r 509342f95564 mercurial/commands.py
--- a/mercurial/commands.py	Fri Dec 29 06:08:46 2006 +0100
+++ b/mercurial/commands.py	Fri Dec 29 06:37:43 2006 +0100
@@ -1773,7 +1773,7 @@
         ui.write("%s\n" % f)
 
 def merge(ui, repo, node=None, force=None, branch=None):
-    """Merge working directory with another revision
+    """merge working directory with another revision
 
     Merge the contents of the current working directory and the
     requested revision. Files that changed between either parent are
@@ -2489,7 +2489,7 @@
     return postincoming(ui, repo, modheads, opts['update'])
 
 def update(ui, repo, node=None, clean=False, branch=None, date=None):
-    """update or merge working directory
+    """update working directory
 
     Update the working directory to the specified revision.
 
@@ -2501,7 +2501,7 @@
     merge command.
 
     By default, update will refuse to run if doing so would require
-    merging or discarding local changes.
+    discarding local changes.
     """
     if date:
         if node:
@@ -2807,7 +2807,7 @@
          ] + walkopts,
          _('hg log [OPTION]... [FILE]')),
     "manifest": (manifest, [], _('hg manifest [REV]')),
-    "merge":
+    "^merge":
         (merge,
          [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')),
           ('f', 'force', None, _('force a merge with outstanding changes'))],