X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge-file.c;h=1e70073a7ed022675031706a8e9f8c57ff3aa2a9;hb=0901d5a2ef80996cf64c8afeaec765e1bc09f795;hp=1efc4e09bc12c73978789502d041fd596397aeb3;hpb=df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 1efc4e09b..1e70073a7 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -25,7 +25,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 	const char *names[3] = { NULL, NULL, NULL };
 	mmfile_t mmfs[3];
 	mmbuffer_t result = {NULL, 0};
-	xpparam_t xpp = {XDF_NEED_MINIMAL};
+	xmparam_t xmp = {{XDF_NEED_MINIMAL}};
 	int ret = 0, i = 0, to_stdout = 0;
 	int level = XDL_MERGE_ZEALOUS_ALNUM;
 	int style = 0, quiet = 0;
@@ -73,7 +73,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 	}
 
 	ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
-			&xpp, XDL_MERGE_FLAGS(level, style, favor), &result);
+			&xmp, XDL_MERGE_FLAGS(level, style, favor), &result);
 
 	for (i = 0; i < 3; i++)
 		free(mmfs[i].ptr);