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)
commit448598b5089455b30737c08915b62597a2132bf7
tree4d15524145f4732c60e1ed5c64a2d19a5c2f2269
parent44e08b003d37440fba6589c07a9573df9d28e6f5
parent374664478f204ab45bbd494ab21492f331d8b1f0
Merge branch 'bw/diff-metainfo-color'

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