git-diff: use --cc instead of -p.
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 00:37:18 +0000 (16:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 00:37:18 +0000 (16:37 -0800)
commitdf9892ffce46d1f1bd6fe64aa445be2ffe7346cf
treee842e14e04b504cebdb1808ec48219dcbda9bcfd
parent4abd89648eb40384556e2118e74be03325d0b05d
git-diff: use --cc instead of -p.

The --cc output is much nicer when dealing with merges, so use
it by default.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-diff.sh