summaryrefslogtreecommitdiff
path: root/merge-file.h
Commit message (Expand)AuthorAgeFilesLines
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-7/+0
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-0/+7