Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 3068:547d1a4aa105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg merge: fix lookup of branch add some tests for branch usage
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 08 Sep 2006 02:16:16 +0200
parents 15526271eafb
children bc3fe3b5b785
line wrap: on
line diff
--- 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()