After a merge conflict, 'git diff' shows a combined diff, which presents only the parts that conflicted or where there are near-by changes from different parents (potential conflicts). Is there a command line switch so that *all* changes are shown, even non-conflicting ones? 'git diff', 'git diff --cc', and 'git diff -c' all show the same output. -- Hannes -- To unsubscribe from this list: 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
