Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11

[git] / merge-file.h

#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