config: mark unused callback parameters

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 14b83620191019e465291d13be023df794ffb645..9f3ae1f8fe1d8cd044f644bfc6d35d46806dda49 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -249,7 +249,8 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
 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, void *cb)
+static int read_merge_config(const char *var, const char *value,
+                            void *UNUSED(cb))
 {
        struct ll_merge_driver *fn;
        const char *key, *name;