X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ll-merge.c;h=9837c842a3f215ebee7cbe9690e42e216fb5c76c;hb=7b4b59a963c726d30b319a79c1f8243a82d6e12f;hp=5ae74331bc2c55638bc5bf1bbfdc7e340199cb01;hpb=30c0312fd182942c10421e77d2b3ec6284cc0468;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index 5ae74331b..9837c842a 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -225,7 +225,7 @@ static int 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)
+static int read_merge_config(const char *var, const char *value, void *cb)
 {
 	struct ll_merge_driver *fn;
 	const char *ep, *name;
@@ -309,7 +309,7 @@ static void initialize_ll_merge(void)
 	if (ll_user_merge_tail)
 		return;
 	ll_user_merge_tail = &ll_user_merge;
-	git_config(read_merge_config);
+	git_config(read_merge_config, NULL);
 }
 
 static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr)