merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
11
third_party/git/merge-blobs.h
vendored
Normal file
11
third_party/git/merge-blobs.h
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#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 */
|
||||
Loading…
Add table
Add a link
Reference in a new issue