Andrew's git / gitweb.git / merge-file.h
?
merge-file.hon commit http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping (6f9dd67)
   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