From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Tue, 03 Jun 2008 10:06:05 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <vpqabi2zvci.fsf@bauges.imag.fr>
In-Reply-To: <200806030314.03252.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> I think that octopus merge (merge with more than two parents/legs) is 
> feature which is unique to git (isn't it?).  

bzr can do similar things:

bzr merge some-branch
bzr merge --force some-other-branch
bzr commit

Since bzr doesn't auto-commit after a merge, the above commands
actually creates only one revision with 3 parents (the --force is here
to let merge do it's job with uncommited changes in the tree).

-- 
Matthieu