Merge branch 'rs/color-escape-has-zero-width'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:33:30 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:33:30 +0000 (22:33 -0800)
* rs/color-escape-has-zero-width:
strbuf_add_wrapped_text(): skip over colour codes

Trivial merge