summaryrefslogtreecommitdiff
path: root/merge-blobs.c
AgeCommit message (Expand)AuthorFilesLines
2016-03-10Merge branch 'jk/no-diff-emit-common' into maintLibravatar Junio C Hamano1-36/+2
2016-02-22merge-tree: drop generate_common strategyLibravatar Jeff King1-36/+2
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-2/+2
2015-03-23merge-blobs.c: fix a memleakLibravatar Stefan Beller1-1/+3
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-0/+124