From: Junio C Hamano Date: Tue, 24 Nov 2009 06:33:30 +0000 (-0800) Subject: Merge branch 'rs/color-escape-has-zero-width' X-Git-Tag: v1.6.6-rc1~35 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1fdffa616119aeb607e211a77688c9bc3883ca87;p=git.git Merge branch 'rs/color-escape-has-zero-width' * rs/color-escape-has-zero-width: strbuf_add_wrapped_text(): skip over colour codes --- 1fdffa616119aeb607e211a77688c9bc3883ca87