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)
commit1fdffa616119aeb607e211a77688c9bc3883ca87
treeab7ac6c27518735c1481d54b98d9190ce836e6fd
parentd2cd66556dba1ab848cfad7b0eed049b08957b12
parent8a3c63e01d2b1df471beafff5fb78df4bade9388
Merge branch 'rs/color-escape-has-zero-width'

* rs/color-escape-has-zero-width:
  strbuf_add_wrapped_text(): skip over colour codes