X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=3764a1ab72354a3ce643c899c1e8cf5443d4e7cb;hb=3c8710aeaa81a70ecad9facfc332d843ee37de35;hp=f9b3d854a921ab6fa3eed6f4dbf01af1a8657602;hpb=419ff2c575b96555dedac8c736025acfca9f982f;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index f9b3d854a..3764a1ab7 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -139,17 +139,17 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 {
 	char temp[4][50];
 	struct strbuf cmd = STRBUF_INIT;
-	struct strbuf_expand_dict_entry dict[] = {
-		{ "O", temp[0] },
-		{ "A", temp[1] },
-		{ "B", temp[2] },
-		{ "L", temp[3] },
-		{ NULL }
-	};
+	struct strbuf_expand_dict_entry dict[5];
 	const char *args[] = { NULL, NULL };
 	int status, fd, i;
 	struct stat st;
 
+	dict[0].placeholder = "O"; dict[0].value = temp[0];
+	dict[1].placeholder = "A"; dict[1].value = temp[1];
+	dict[2].placeholder = "B"; dict[2].value = temp[2];
+	dict[3].placeholder = "L"; dict[3].value = temp[3];
+	dict[4].placeholder = NULL; dict[4].value = NULL;
+
 	if (fn->cmdline == NULL)
 		die("custom merge driver %s lacks command line.", fn->name);