From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Jun 2006 20:32:46 GMT
Subject: Re: git-diff --cc broken in 1.4.0?
Message-ID: <7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com>

"Martin Langhoff" <martin.langhoff@gmail.com> writes:

> I was looking at some merges in gitk and lamenting the apparent loss
> of the nice two-sided diff we get with -cc, and now duting a slightly
> messy merge I did git-diff -cc only to get...

This not a regression that I know of in 1.4.0; mind showing the
stage 2 and 3 blobs and the file in the resolution result (I do
not need stage 1)?

One thing to note is that --cc does not show a hunk in which you
take only from one side.

>
> $ git-ls-files --unmerged
> 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1       local/version.php
> 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2       local/version.php
> 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3       local/version.php