merge-file.hon commit Merge branch 'js/maint-fast-export-mark-error' into maint (ca4effd)
   1#ifndef MERGE_FILE_H
   2#define MERGE_FILE_H
   3
   4extern void *merge_file(const char *path, struct blob *base, struct blob *our,
   5                        struct blob *their, unsigned long *size);
   6
   7#endif