Skip to main content

Browse the archive

Revision 7a5026529529e811b41de02ca12aa6c8ff3d11c5 authored by Junio C Hamano on 23 December 2020, 21:59:46 UTC, committed by Junio C Hamano on 23 December 2020, 21:59:46 UTC 
Merge branch 'ma/maintenance-crontab-fix'
 
Hotfix for a topic of this cycle.

* ma/maintenance-crontab-fix:
  t7900-maintenance: test for magic markers
  gc: fix handling of crontab magic markers
  git-maintenance.txt: add missing word
2 parent s 04cd999 + a52df25
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