Paul Mackerras <paulus@xxxxxxxxx> writes: > This implements a 3-way diff between the HEAD commit, the state in the > index, and the working directory. This is like the n-way diff for a > merge, and uses much of the same code. It is invoked with the -c flag > to git-diff-index, which it already accepted and did nothing with. > > Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx> > --- > Junio, does this look right? Seems correct from a cursory look. This also seems to change the behaviour for an unmerged entry case slightly but I think it is for the better (depending on the definition of "better" -- some people may feel combined diff to be weird and confusing). - 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