From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 29 Mar 2007 23:13:08 GMT
Subject: Re: [PATCH] An attempt to resolve a rename/rename conflict in recursive merge
Message-ID: <20070329231308.GF2809@steel.home>
In-Reply-To: <20070329230156.GE2809@steel.home>

Alex Riesen, Fri, Mar 30, 2007 01:01:56 +0200:
> 
> I just left all three entries in the index for the virtual commit to
> pick them up: it'll usually(always?) generate a conflict which has to
> be resolved manually. Many times, perhaps.
> 

Nah, doesn't do anything good. Does not crash, though.