X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-tree.c;h=e08324686cc090fa9bd94d7f069b025454c7acdf;hb=a41acc63badf20cbb22cca61039dca9309deaa19;hp=3b8d9e6887ae051bf61cc0833f97d83bb47a0bae;hpb=1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 3b8d9e688..e08324686 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -106,8 +106,8 @@ static void show_diff(struct merge_list *entry)
 	xdemitcb_t ecb;
 
 	xpp.flags = XDF_NEED_MINIMAL;
+	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
-	xecfg.flags = 0;
 	ecb.outf = show_outf;
 	ecb.priv = NULL;
 
@@ -119,7 +119,7 @@ static void show_diff(struct merge_list *entry)
 	if (!dst.ptr)
 		size = 0;
 	dst.size = size;
-	xdl_diff(&src, &dst, &xpp, &xecfg, &ecb);
+	xdi_diff(&src, &dst, &xpp, &xecfg, &ecb);
 	free(src.ptr);
 	free(dst.ptr);
 }