git/merge-file.h

#ifndef MERGE_FILE_H
#define MERGE_FILE_H

extern void *merge_file(const char *path, struct blob *base, struct blob *our,
			struct blob *their, unsigned long *size);

#endif
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-07 22:31:24 +04:00			`#ifndef MERGE_FILE_H`
			`#define MERGE_FILE_H`

			`extern void merge_file(const char path, struct blob base, struct blob our,`
			`struct blob their, unsigned long size);`

			`#endif`