summaryrefslogtreecommitdiff
path: root/merge-ll.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-ll.c')
-rw-r--r--merge-ll.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ll.c b/merge-ll.c
index 933adc3769..95795b70f5 100644
--- a/merge-ll.c
+++ b/merge-ll.c
@@ -264,6 +264,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;