On Tue, 26 Jan 2010, Junio C Hamano wrote: > When showing a merge, there is one end result (the merged version), so it > fits the model that is a natural extension of two-way diff. In the "two > patches walked in a bar, modified the same version and produced two > different results" case, the common thing is the preimage, not postimage. > I couldn't come up with a combined output format that visually makes sense > for that mode of operation. Hmmmmmm yeah. I didn't think it through all the way. Too bad. Nicolas -- 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