Merge branch 'jc/maint-diff-patch-header'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
By Junio C Hamano
* jc/maint-diff-patch-header:
diff -p: squelch "diff --git" header for stat-dirty paths
t4011: illustrate "diff-index -p" on stat-dirty paths
t4011: modernise style

1  2 
diff.c
diff --cc diff.c
Simple merge