summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:50:32 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:50:32 +0900
commit4aeeef377347934d6f459e27f7d793de4ce384bb (patch)
treea8031c9623eac896bf474ba2158e39afc6abb5b3 /fmt-merge-msg.h
parentMerge branch 'ew/repack-with-bitmaps-by-default' (diff)
parent*.[ch]: manually align parameter lists (diff)
downloadtgif-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.xz
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function declarlation. * dl/no-extern-in-func-decl: *.[ch]: manually align parameter lists *.[ch]: remove extern from function declarations using sed *.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'fmt-merge-msg.h')
-rw-r--r--fmt-merge-msg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index b28d3a6113..01e3aa88c5 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -2,6 +2,6 @@
#define FMT_MERGE_MSG_H
extern int merge_log_config;
-extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
+int fmt_merge_msg_config(const char *key, const char *value, void *cb);
#endif /* FMT_MERGE_MSG_H */