X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=merge-file.c;h=1e031eafe0c70eec092a53e8ab291b9887622b0e;hb=44c637c8021e44253f0f8cb17391092e08b39e73;hp=748d15c0e04c0d63fbe586ad59c795ddaf3dec92;hpb=803527f1d9b284fa848d4a4bad23158c162a5d54;p=git.git

diff --git a/merge-file.c b/merge-file.c
index 748d15c0e..1e031eafe 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -62,6 +62,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	xdemitcb_t ecb;
 
 	xpp.flags = XDF_NEED_MINIMAL;
+	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
 	xecfg.flags = XDL_EMIT_COMMON;
 	ecb.outf = common_outf;