hg merge -b

[Christian Ebert]

* Benoit Boissinot on Thursday, September 07, 2006 at 23:34:20 +0200:
> diff -r 3f92c142b4ec mercurial/commands.py
> --- a/mercurial/commands.py	Tue Aug 29 17:11:42 2006 +0900
> +++ b/mercurial/commands.py	Fri Sep 08 00:30:21 2006 +0200
> @@ -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()

Works as expected. Thank you.

c
-- 
_B A U S T E L L E N_ lesen! --->> <http://www.blacktrash.org/baustellen.html>