Merge branch 'bw/diff-metainfo-color'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:25 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:25 +0000 (11:21 -0700)
* bw/diff-metainfo-color:
  diff: fix coloring of extended diff headers

1  2 
diff.c

diff --cc diff.c
Simple merge