Merge branch 'jh/trace2-pretty-output'
[git/git.git] / merge-blobs.h
CommitLineData
fa2364ec
JH
1#ifndef MERGE_BLOBS_H
2#define MERGE_BLOBS_H
3
f4a55b27
NTND
4struct blob;
5struct index_state;
fa2364ec 6
55454427 7void *merge_blobs(struct index_state *, const char *,
ad6dad09
DL
8 struct blob *, struct blob *,
9 struct blob *, unsigned long *);
fa2364ec
JH
10
11#endif /* MERGE_BLOBS_H */