From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Jun 2005 04:11:41 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <Pine.LNX.4.58.0506082110510.2286@ppc970.osdl.org>
In-Reply-To: <42A7B28A.9010508@pobox.com>



On Wed, 8 Jun 2005, Jeff Garzik wrote:
> 
> If this merge-gracefully stuff is all checked into git.git, I can 
> definitely give it some real-world testing.

Yup, all there. Not a _ton_ of testing exactly, but I did actually test
both the content conflict case and the "new directory" case. At least 
once.

		Linus