Merge branch 'maint'
[git] / merge-file.h
1 #ifndef MERGE_FILE_H
2 #define MERGE_FILE_H
3
4 extern void *merge_file(const char *path, struct blob *base, struct blob *our,
5                         struct blob *their, unsigned long *size);
6
7 #endif