summaryrefslogtreecommitdiff
path: root/merge-file.h
AgeCommit message (Expand)Author
2012-12-10Which merge_file() function do you mean?Junio C Hamano
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones