Merge branch 'bw/diff-metainfo-color' into maint
commitcb2af93ac183c1a6d5635bb2be047c1ade362099
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:10 +0000 (21 05:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:10 +0000 (21 05:40 -0700)
tree873eccd7b908c65f55a78c6f0685f9bc90601fd1
parent443f26cbcac66368eb0ec8a8a250bf5815ad0a10
parent374664478f204ab45bbd494ab21492f331d8b1f0
Merge branch 'bw/diff-metainfo-color' into maint

* bw/diff-metainfo-color:
  diff: fix coloring of extended diff headers
diff.c