Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-04-29 11:28:23 +0300
committerJunio C Hamano <gitster@pobox.com>2019-05-05 09:20:10 +0300
commitad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (patch)
treecbde3e662ca85541fd7d0c9b0220776fee59cdbf /merge-blobs.h
parentb199d7147a218c3b10b077f9caad0f207bc34d7a (diff)
*.[ch]: manually align parameter lists
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>
Diffstat (limited to 'merge-blobs.h')
-rw-r--r--merge-blobs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-blobs.h b/merge-blobs.h
index 863a7e0807..13cf9669e5 100644
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -5,7 +5,7 @@ struct blob;
struct index_state;
void *merge_blobs(struct index_state *, const char *,
- struct blob *, struct blob *,
- struct blob *, unsigned long *);
+ struct blob *, struct blob *,
+ struct blob *, unsigned long *);
#endif /* MERGE_BLOBS_H */