From: Linus Torvalds Date: Tue, 26 Apr 2005 19:09:14 GMT Subject: Re: [RFC] diff-cache buglet Message-ID: In-Reply-To: <7vk6mpnz96.fsf@assigned-by-dhcp.cox.net> On Tue, 26 Apr 2005, Junio C Hamano wrote: > > We should just fix "remove-merge-entries" and call that > unconditionally before the read-tree is called. Once it is > fixed, we need to think about how to show this stage > information but that should be a separate discussion. I already applied that part of your fix and pushed it out, there as no question about that one. I just thought that _if_ you wanted the unmerged parts to show up, then the "1//filename.c" thing might be acceptable. Personally, I just think diff-cache is pretty nonsensical with unmerged files, Linus