Merge branch 'js/rebase-autostash-detach-fix'
[git.git] / merge-blobs.h
blobcc31038b807fbee073a063ec83fe298c87fd2b3d
1 #ifndef MERGE_BLOBS_H
2 #define MERGE_BLOBS_H
4 struct blob;
5 struct index_state;
7 extern void *merge_blobs(struct index_state *, const char *,
8 struct blob *, struct blob *,
9 struct blob *, unsigned long *);
11 #endif /* MERGE_BLOBS_H */