From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2016 21:37:15 +0000 (-0800)
Subject: Merge branch 'jk/more-comments-on-textconv'
X-Git-Tag: v2.8.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ed26a44b3415f5761bdab21f823d964c20a2824?hp=--cc

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

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
---

3ed26a44b3415f5761bdab21f823d964c20a2824