]> git.ipfire.org Git - thirdparty/git.git/blob - merge-blobs.h
Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
[thirdparty/git.git] / merge-blobs.h
1 #ifndef MERGE_BLOBS_H
2 #define MERGE_BLOBS_H
3
4 #include "blob.h"
5
6 extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
7
8 #endif /* MERGE_BLOBS_H */