aboutsummaryrefslogtreecommitdiff
path: root/merge-blobs.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-26
|\
| * merge-tree: drop generate_common strategyJeff King2016-02-22
* | Remove get_object_hash.brian m. carlson2015-11-20
* | Add several uses of get_object_hash.brian m. carlson2015-11-20
|/
* merge-blobs.c: fix a memleakStefan Beller2015-03-23
* Which merge_file() function do you mean?Junio C Hamano2012-12-09