mirror of
https://github.com/git/git.git
synced 2024-11-08 14:09:26 +01:00
ad6dad0996
In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists should be realigned. Viewing this patch with 'git diff -w' should produce no output. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 lines
232 B
C
12 lines
232 B
C
#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 */
|