summaryrefslogtreecommitdiff
path: root/merge-blobs.c
AgeCommit message (Expand)Author
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano
2016-02-23merge-tree: drop generate_common strategyJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-03-23merge-blobs.c: fix a memleakStefan Beller
2012-12-10Which merge_file() function do you mean?Junio C Hamano