Merge branch 'bw/diff-metainfo-color' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:10 +0000 (05:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:10 +0000 (05:40 -0700)
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers

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