On Fri, 15 Apr 2005, Junio C Hamano wrote: > > I'd take the hint, but I would say the current Perl version > would be far more usable than the C version I would come up with > by the end of this weekend because:
Actually, it turns out that I have a cunning plan. I'm full of cunning plans, in fact. It turns out that I can do merges even more simply, if I just allow the notion of "state" into an index entry, and allow multiple index entries with the same name as long as they differ in "state". And that means that I can do all the merging in the regular index tree, using very simple rules. Let's see how that works out. I'm writing the code now. Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html