X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=7d4f628444058d80e798e141285d558fb7104c5b;hb=793ad04198a79c14094bd1311a9c42f1293c6183;hp=3b8d9e6887ae051bf61cc0833f97d83bb47a0bae;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;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;