From: Junio C Hamano Date: Fri, 03 Feb 2006 05:28:00 GMT Subject: Re: [PATCH] combine-diff: add safety check to --cc. Message-ID: <7vu0bhko4f.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > And now when I look at Len's "Merge from hell", not only does it take less > than 2 seconds for git-diff-tree to calculate, it looks correct too. At > least I don't see anything that I consider extraneous, although it might, > of course, have removed too much, and I'd not notice. I've run "diff -u0" between -c output and --cc output and what was dropped looked sane.