Merge branch 'jk/more-comments-on-textconv' into maint
commitaa6c22ec43fa9e2ac531360b5f274446e27d8be1
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:42 +0000 (10 11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:43 +0000 (10 11:13 -0800)
tree7459843cf85a3b6182bcec2f30c7b6fd36b73165
parent6044329cf14e922aad270778db88767e97147875
parenta64e6a44c63a965c5bc26242ddd3ed049b42e117
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
diff.c
diff.h