X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=7d4f628444058d80e798e141285d558fb7104c5b;hb=c2a33679a726aeb75529540c2b295f21023ddbc7;hp=3b8d9e6887ae051bf61cc0833f97d83bb47a0bae;hpb=bff898b894815ad291b35d213f1c022d1d16a9b9;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 3b8d9e688..7d4f62844 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;