From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Jan 2013 22:04:22 +0000 (-0800)
Subject: Merge branch 'sp/shortlog-missing-lf' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74474a94f217a0499cc23346d8d094893fb46257;p=git.git

Merge branch 'sp/shortlog-missing-lf' into maint

* sp/shortlog-missing-lf:
  strbuf_add_wrapped*(): Remove unused return value
  shortlog: fix wrapping lines of wraplen
---

74474a94f217a0499cc23346d8d094893fb46257
diff --cc utf8.h
index 93ef60042,f50c567d4..a214238bd
--- a/utf8.h
+++ b/utf8.h
@@@ -7,11 -7,10 +7,11 @@@ int utf8_width(const char **start, size
  int utf8_strwidth(const char *string);
  int is_utf8(const char *text);
  int is_encoding_utf8(const char *name);
 +int same_encoding(const char *, const char *);
  
- int strbuf_add_wrapped_text(struct strbuf *buf,
+ void strbuf_add_wrapped_text(struct strbuf *buf,
  		const char *text, int indent, int indent2, int width);
- int strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
+ void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
  			     int indent, int indent2, int width);
  
  #ifndef NO_ICONV