summaryrefslogtreecommitdiff
path: root/merge-file.h
Commit message (Collapse)AuthorAgeFilesLines
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-0/+7
In order to fix the warning, we add a new "merge-file.h" header containing the extern declaration of the merge_file() function, and include the header in the source files that require the declaration. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>