Merge branch 'da/difftool-fixes' into next
[git/mjg.git] / merge-blobs.h
blob62b569e472450540689bbb0a4d08c1e3cfd89f12
1 #ifndef MERGE_BLOBS_H
2 #define MERGE_BLOBS_H
4 #include "blob.h"
6 extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
8 #endif /* MERGE_BLOBS_H */