Imported Upstream version 2.30.0

[platform/upstream/git.git] / builtin / merge-tree.c

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e72714a..de85207 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -109,6 +109,7 @@ static void show_diff(struct merge_list *entry)
        xdemitconf_t xecfg;
        xdemitcb_t ecb;
 
+       memset(&xpp, 0, sizeof(xpp));
        xpp.flags = 0;
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = 3;