diff options
Diffstat (limited to 'fmt-merge-msg.h')
| -rw-r--r-- | fmt-merge-msg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h index 99054042dc..73ca3e4465 100644 --- a/fmt-merge-msg.h +++ b/fmt-merge-msg.h @@ -13,7 +13,8 @@ struct fmt_merge_msg_opts { }; extern int merge_log_config; -int fmt_merge_msg_config(const char *key, const char *value, void *cb); +int fmt_merge_msg_config(const char *key, const char *value, + const struct config_context *ctx, void *cb); int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *); |