"Martin Langhoff" <martin.langhoff@xxxxxxxxx> 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 - : 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