?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1
[git/jnareb-git.git] / merge-blobs.h
blob62b569e472450540689bbb0a4d08c1e3cfd89f12
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 */
git with Jakub Narębski modifications