aboutsummaryrefslogtreecommitdiff
path: root/merge-blobs.h
Commit message (Expand)AuthorAge
* Which merge_file() function do you mean?Junio C Hamano2012-12-09