Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

[git/jnareb-git.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