Jakub Narebski <jnareb@gmail.com> writes:

quoted text
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html