Skip to main content

Browse the archive

Staging
v0.5.1
Revision 7397ca33730626f682845f8691b39c305535611e authored by Jonathan Nieder on 19 April 2020, 23:31:07 UTC, committed by Jonathan Nieder on 19 April 2020, 23:31:07 UTC 
Git 2.25.4
 
This merges up the security fix from v2.17.5.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2 parent s 67b0a24 + b86a4be
Raw File
merge-blobs.h 
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

struct blob;
struct index_state;

void *merge_blobs(struct index_state *, const char *,
		  struct blob *, struct blob *,
		  struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
back to top