aboutsummaryrefslogtreecommitdiffstats
path: root/merge-file.h (follow)
AgeCommit message (Expand)AuthorFilesLines
2012-12-09Which merge_file() function do you mean?Junio C Hamano1-7/+0
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones1-0/+7