From: Daniel Barkalow <barkalow@iabervon.org>
Date: Fri, 09 Sep 2005 17:25:09 GMT
Subject: Re: [RFH] Merge driver
Message-ID: <Pine.LNX.4.63.0509091320420.23242@iabervon.org>
In-Reply-To: <7vy866jio4.fsf@assigned-by-dhcp.cox.net>

On Fri, 9 Sep 2005, Junio C Hamano wrote:

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > It tries to make sure that there is room to put stuff for resolving a 
> > conflict without messing with modified files in the directory.
> 
> I agree it can be used that way, but nobody seems to use it for
> that purpose as far as I can tell hence my earlier comment.  But
> let's leave the door open by having them as independent
> options.

Ah, okay. I hadn't realized that resolve used -u for that call to 
read-tree. You're entirely right.

	-Daniel
*This .sig left intentionally blank*