Merge branch 'rs/optim-text-wrap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:10 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:10 +0000 (12:44 -0800)
* rs/optim-text-wrap:
  utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
  utf8.c: remove strbuf_write()
  utf8.c: remove print_spaces()
  utf8.c: remove print_wrapped_text()

1  2 
builtin-shortlog.c
utf8.c
utf8.h

Simple merge
diff --cc utf8.c
Simple merge
diff --cc utf8.h
Simple merge