From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 19:13:42 +0000 (-0800)
Subject: Merge branch 'jk/more-comments-on-textconv' into maint
X-Git-Tag: v2.7.3~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa6c22ec43fa9e2ac531360b5f274446e27d8be1;p=git

Merge branch 'jk/more-comments-on-textconv' into maint

The memory ownership rule of fill_textconv() API, which was a bit
tricky, has been documented a bit better.

* jk/more-comments-on-textconv:
  diff: clarify textconv interface
---

aa6c22ec43fa9e2ac531360b5f274446e27d8be1