X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge-tree.c;h=fc00d794d641c146023a78d7d8e4143f0fdac302;hb=d4f8f74bc6cf8c5851f67d46c49b6e2c8fea601b;hp=a4a4f2ce4c3f147062070c2acc08eaf9f4d40be8;hpb=f62e53c897c359b5885c474c41341d83845a78f6;p=git.git

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index a4a4f2ce4..fc00d794d 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -106,7 +106,7 @@ static void show_diff(struct merge_list *entry)
 	xdemitconf_t xecfg;
 	xdemitcb_t ecb;
 
-	xpp.flags = XDF_NEED_MINIMAL;
+	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
 	ecb.outf = show_outf;