changeset 3524 | ba94e80e5540 |
parent 3523 | 2fb30a9d2b3b |
child 3539 | e1508621e9ef |
child 3554 | 7ed86c28f1ae |
--- 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)