X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=db4d0d50d32d8852d1cb5173125e4173c3badb49;hb=ad98a58b3d7a151dca59364b72097b6b875a56f6;hp=c336c93c01c0bad76d6189065f0e6630d0b7f5af;hpb=7e74a73e6b57652c2710a9814a5449afeec5bd44;p=git.git

diff --git a/merge-file.c b/merge-file.c
index c336c93c0..db4d0d50d 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -66,7 +66,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	xdemitcb_t ecb;
 
 	memset(&xpp, 0, sizeof(xpp));
-	xpp.flags = XDF_NEED_MINIMAL;
+	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
 	xecfg.flags = XDL_EMIT_COMMON;