# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1161818994 18000
# Node ID ba94e80e55403ee28855c6a4e1bd97b8ee254e38
# Parent  2fb30a9d2b3b36e8e50f0cd72d14ebc882cc6014
Remove update -m, deprecated for 0.9.1

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2746,11 +2746,7 @@ def update(ui, repo, node=None, merge=Fa
     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)