Skip to main content

Browse the archive

Revision 3fc7fc1c5f05602be0ad9d81ba3797dfc97f8efd authored by Junio C Hamano on 14 December 2020, 18:21:38 UTC, committed by Junio C Hamano on 14 December 2020, 18:21:38 UTC 
Merge branch 'js/t5526-with-no-particular-primary-branch-name'
 
Test update.

* js/t5526-with-no-particular-primary-branch-name:
  t5526: drop the prereq expecting the default branch name `main`
  t5526: avoid depending on a specific default branch name
2 parent s 043bfc6 + 71f4a93
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