Merge branch 'jc/color-attrs'
commitd7173d942ea897b67ac9ba3bab2a0cc374684ca6
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:36 +0000 (20 11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:36 +0000 (20 11:29 -0700)
tree30470f05d89570e5d2e125feb140b4b3da630a39
parent49559cad6cab8af548321249d320d9bb372d1859
parent8b124135a97b593d50a90abcec231552b31c7ade
Merge branch 'jc/color-attrs'

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