Skip to content
Find file
Fetching contributors…
Cannot retrieve contributors at this time
8 lines (5 sloc) 175 Bytes
#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
Something went wrong with that request. Please try again.