From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 06 May 2008 16:15:22 GMT
Subject: Re: merge renamed files/directories?
Message-ID: <alpine.LFD.1.10.0805060914190.32269@woody.linux-foundation.org>
In-Reply-To: <alpine.LFD.1.10.0805060851470.32269@woody.linux-foundation.org>



On Tue, 6 May 2008, Linus Torvalds wrote:
> 
>							I can pretty much 
> guarantee that any sane project will have more data conflicts than they 
> will have rename conflicts (whether single-file or directory), and it's 
> not only a problem, it's something that is absolutely *required* from a 
         ^^^-- not
> source control management system!

Oops. That didn't read well.

			Linus