mirror of
https://github.com/git/git.git
synced 2024-11-15 13:43:45 +01:00
8 lines
175 B
C
8 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
|