mercurial/commands.py

--- a/mercurial/commands.py	Wed Oct 25 17:53:24 2006 -0500
+++ b/mercurial/commands.py	Wed Oct 25 18:29:54 2006 -0500
@@ -2746,11 +2746,7 @@
     merging or discarding local changes.
     """
     node = _lookup(repo, node, branch)
-    if merge:
-        ui.warn(_('(the -m/--merge option is deprecated; '
-                  'use the merge command instead)\n'))
-        return hg.merge(repo, node, force=force)
-    elif clean:
+    if clean:
         return hg.clean(repo, node)
     else:
         return hg.update(repo, node)