Merge branch 'bw/diff-metainfo-color' into next
commit3aa552eec39c4049affcb2d357b5fc6810e4e756
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:04:39 +0000 (21 04:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:04:39 +0000 (21 04:04 -0700)
tree9ea02803cb09d0810f5d7392c119dcedec8d763f
parent9d31940dde2e0503f99ba13f58be1a572186cf9e
parent374664478f204ab45bbd494ab21492f331d8b1f0
Merge branch 'bw/diff-metainfo-color' into next

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