Merge branch 'jk/more-comments-on-textconv'
commit3ed26a44b3415f5761bdab21f823d964c20a2824
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:15 +0000 (26 13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:15 +0000 (26 13:37 -0800)
tree332fe9b5ccddbdec65ab482e7d1100c57355f253
parent18b26b18c50637eaa8fb1ae5f42fd94c8ac99507
parenta64e6a44c63a965c5bc26242ddd3ed049b42e117
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
diff.c
diff.h