From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Wed, 14 Jun 2006 20:58:28 GMT
Subject: Re: git-diff --cc broken in 1.4.0?
Message-ID: <46a038f90606141358l5ee4f8abv207b68dc534ce02c@mail.gmail.com>
In-Reply-To: <7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net>

On 6/15/06, Junio C Hamano <junkio@cox.net> wrote:
> One thing to note is that --cc does not show a hunk in which you
> take only from one side.

Must have been that. I was looking at a big (but clean) merge, and
where gitk used to show a large-ish diff there was nothing. I somehow
expected an even larger diff with the changes against both sides.

thanks for the clarification and sorry about that!



m