Skip to main content

Browse the archive

Revision 14fe4af084071803ab4f16e6841ff64ba7351071 authored by Junio C Hamano on 02 August 2019, 20:12:03 UTC, committed by Junio C Hamano on 02 August 2019, 20:12:03 UTC 
Merge branch 'sg/fsck-config-in-doc'
 
Doc update.

* sg/fsck-config-in-doc:
  Documentation/git-fsck.txt: include fsck.* config variables
2 parent s c62bc49 + d61e6ce
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