Ramsay Jones 1e0f8c41ac sparse: Fix an "symbol 'merge_file' not decared" warning ...

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>

2011-04-11 10:35:25 -07:00

2.6 KiB

Raw Blame History

View Raw