Junio C Hamano [mailto:gitster@xxxxxxxxx] wrote: > Edward Thomson <ethomson@xxxxxxxxxxxxx> writes: > > Junio, did you have additional thoughts on this? > > Not at this moment. > > I think we have covered the principles (do not unnecessarily duplicate > information, do not break existing implementations unnecessarily, etc.) already, > and we know how we want to record "one side renamed A to B, the other side > renamed A to C" case, but I do not think the discussion covered all cases yet. Sorry, I'm not sure what you're asking for - would you just like some more examples of what this looks like with aforementioned exotic conflict types? Or are you looking for something more strict - BNF format, for example? -ed -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html