From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 04 Feb 2009 21:56:19 GMT
Subject: Re: Confused about diff-tree --cc output
Message-ID: <7vk585n9x8.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <76718490902041313y44eeb99bya33513bc9818aeb0@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> 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.