1 Commits (c6a4e3f7a78011bd7c1c75521c6d12ac311513f7)

Author	SHA1	Message	Date
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