diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:15 -0800 |
| commit | 3ed26a44b3415f5761bdab21f823d964c20a2824 (patch) | |
| tree | 332fe9b5ccddbdec65ab482e7d1100c57355f253 /builtin/merge-recursive.c | |
| parent | Merge branch 'jk/no-diff-emit-common' (diff) | |
| parent | diff: clarify textconv interface (diff) | |
| download | tgif-3ed26a44b3415f5761bdab21f823d964c20a2824.tar.xz | |
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
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions