Sync with GIT 1.5.3.3

diff --git a/merge-tree.c b/merge-tree.c
index 3b8d9e6887ae051bf61cc0833f97d83bb47a0bae..7d4f628444058d80e798e141285d558fb7104c5b 100644 (file)
--- 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;