Which merge_file() function do you mean?
[git/git.git] / merge-blobs.h
CommitLineData
fa2364ec
JH
1#ifndef MERGE_BLOBS_H
2#define MERGE_BLOBS_H
3
4#include "blob.h"
5
6extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
7
8#endif /* MERGE_BLOBS_H */