From: Junio C Hamano Date: Thu, 09 Jun 2005 17:26:35 GMT Subject: Re: [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally Message-ID: <7v7jh3phkk.fsf@assigned-by-dhcp.cox.net> In-Reply-To: >>>>> "LT" == Linus Torvalds writes: LT> No, I think this is quite possibly wrong for several reasons. I agree with everything you said. I need to regurgitate other points you raised, but one immediate comment on the "lost remove" case. The current two-way code has the same brokenness in that it does not unlink removed files under "-u". We either need the "list of files to be removed", or we need to make two-way abort if we see these "remove" cases.