X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge-file.c;h=b8e9e5ba01658bbdd6e9d712b00da902b6f33fbe;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=610849a6533c6fd2d3d2e8d3f8d233757174aabd;hpb=356169c1f66287629ea08e8c9c6e27b00ff8707a;p=git.git

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 610849a65..b8e9e5ba0 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};
-	xmparam_t xmp = {{XDF_NEED_MINIMAL}};
+	xmparam_t xmp = {{0}};
 	int ret = 0, i = 0, to_stdout = 0;
 	int quiet = 0;
 	int nongit;