From: Daniel Villeneuve <daniel2villeneuve@videotron.ca>
Date: Tue, 03 Jun 2008 02:16:38 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <4844A986.1050209@videotron.ca>
In-Reply-To: <200806030314.03252.jnareb@gmail.com>

Jakub Narebski wrote:
> I think that octopus merge (merge with more than two parents/legs) is 
> feature which is unique to git (isn't it?).  
PRCS (http://prcs.sourceforge.net) allows to merge multiple branches 
into the
current working directory, making the eventually committed version have 
multiple
parents.
--
Daniel Villeneuve