mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
1e0f8c41ac
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>
7 lines
175 B
C
7 lines
175 B
C
#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
|