summaryrefslogtreecommitdiff
path: root/merge-file.h
blob: 9b3b83ac6c262c313db8a85fd3f7e83564d94186 (plain)
1
2
3
4
5
6
7
#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