merge-file.hon commit Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' (634392b)
   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