Jay Soffian <jaysoffian@xxxxxxxxx> writes:
> My understanding of "git show <merge commit>" is that it should only
> show changes if the merge resulted in a conflict that needed to be
> touched up (ignoring the possibility of an evil merge). Yet git show
> on this commit shows this diff:
I think this is "more than two versions", in
http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491
Nothing new to see here, I think.
--
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
