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... $ git-ls-files --unmerged 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1 local/version.php 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2 local/version.php 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3 local/version.php $ git-diff --cc diff --cc local/version.php index 9352efa,50da9b4..0000000 --- a/local/version.php +++ b/local/version.php cheers, martin - : 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