diff options
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.c b/ll-merge.c index 07ec16e8e5..3936d112e0 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -254,6 +254,7 @@ static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; static const char *default_ll_merge; static int read_merge_config(const char *var, const char *value, + const struct config_context *ctx UNUSED, void *cb UNUSED) { struct ll_merge_driver *fn; |