X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=3120a95f786eadd4cb5d167facc15714904e9665;hb=4c58a7111d9fb4f62ca041fc73e8aec0a2f9c800;hp=1e031eafe0c70eec092a53e8ab291b9887622b0e;hpb=e3c76dbd0f7531eaed3ca8ec0000f03499839304;p=git.git

diff --git a/merge-file.c b/merge-file.c
index 1e031eafe..3120a95f7 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -61,6 +61,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	xdemitconf_t xecfg;
 	xdemitcb_t ecb;
 
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = XDF_NEED_MINIMAL;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
@@ -71,7 +72,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)