From: Junio C Hamano Date: Sat, 16 Apr 2005 17:14:29 GMT Subject: Re: [PATCH 3/2] merge-trees script for Linus git Message-ID: <7v64ym8wzu.fsf@assigned-by-dhcp.cox.net> In-Reply-To: >>>>> "LT" == Linus Torvalds writes: LT> Anyway, with the modified read-tree, as far as I can tell it will now LT> merge all the cases where one side has done something to a file, and the LT> other side has left it alone (or where both sides have done the exact same LT> modification). That should _really_ cut down the cases to just a few files LT> for most of the kernel merges I can think of. LT> Does it do the right thing for your tests? Yes.