mercurial/commands.py
changeset 3068 547d1a4aa105
parent 3065 15526271eafb
child 3069 bc3fe3b5b785
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1940,7 +1940,7 @@ def merge(ui, repo, node=None, force=Non
     revision to merge with must be provided.
     """
 
-    if node:
+    if node or branch:
         node = _lookup(repo, node, branch)
     else:
         heads = repo.heads()