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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed Apr 27 05:07:34 2005
This archive was generated by hypermail 2.1.8 : 2005-04-27 05:07:35 EST