On 6/15/06, Junio C Hamano <junkio@xxxxxxx> 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 - : 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