diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 17:57:28 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-21 09:48:10 -0700 |
| commit | f4a55b27977aeaddbfb73041be26701bcd3868a5 (patch) | |
| tree | e5ad32d53210d753a2069f66ccf9182a13a84876 /merge-blobs.h | |
| parent | ll-merge.c: remove implicit dependency on the_index (diff) | |
| download | tgif-f4a55b27977aeaddbfb73041be26701bcd3868a5.tar.xz | |
merge-blobs.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
| -rw-r--r-- | merge-blobs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/merge-blobs.h b/merge-blobs.h index 62b569e472..cc31038b80 100644 --- a/merge-blobs.h +++ b/merge-blobs.h @@ -1,8 +1,11 @@ #ifndef MERGE_BLOBS_H #define MERGE_BLOBS_H -#include "blob.h" +struct blob; +struct index_state; -extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *); +extern void *merge_blobs(struct index_state *, const char *, + struct blob *, struct blob *, + struct blob *, unsigned long *); #endif /* MERGE_BLOBS_H */ |