X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=2a939c9dd835a7e7946eb1548e4cf637ae3ca329;hb=efb98b44536300f5daed25da3650033a1ce7fdef;hp=748d15c0e04c0d63fbe586ad59c795ddaf3dec92;hpb=803527f1d9b284fa848d4a4bad23158c162a5d54;p=git.git

diff --git a/merge-file.c b/merge-file.c
index 748d15c0e..2a939c9dd 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;
@@ -70,7 +71,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	res->size = 0;
 
 	ecb.priv = res;
-	return xdl_diff(f1, f2, &xpp, &xecfg, &ecb);
+	return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
 }
 
 void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)