Code

Merge branch 'jc/color-attrs' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:24:13 +0000 (16:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:24:13 +0000 (16:24 -0700)
commit0476228de500049804ae599f557658c3f9042ad0
tree4c9185465412afb414bdfb5688f1f804ba3d9fc4
parentbcbbe4f9d9afa025024f18a474d11bfec32e3207
parent8b124135a97b593d50a90abcec231552b31c7ade
Merge branch 'jc/color-attrs' into maint

* jc/color-attrs:
  color: allow multiple attributes
color.c
color.h
t/t4026-color.sh