commit | 0476228de500049804ae599f557658c3f9042ad0 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Mar 24 16:24:13 2010 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Mar 24 16:24:13 2010 -0700 |
tree | 4c9185465412afb414bdfb5688f1f804ba3d9fc4 | |
parent | bcbbe4f9d9afa025024f18a474d11bfec32e3207 [diff] | |
parent | 8b124135a97b593d50a90abcec231552b31c7ade [diff] |
Merge branch 'jc/color-attrs' into maint * jc/color-attrs: color: allow multiple attributes