summaryrefslogtreecommitdiff
path: root/merge-blobs.c
Commit message (Expand)AuthorAgeFilesLines
* merge_blobs: use strbuf instead of manually-sized mmfile_tjk/merge-tree-merge-blobsJeff King2016-02-161-11/+12
* merge-blobs.c: fix a memleakStefan Beller2015-03-231-1/+3
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-0/+124