X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=combine-diff.c;h=655fa89d8a7ffe3c3823080f5af3e5e385e95440;hb=5bfd53629e93113a17fe7d6a7a24554dc3c17cdb;hp=7557136c820a10570e72f6870ecc7a45c4c7ce36;hpb=6e10b9c9999cbbdfae1087a34efd701108acd806;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 7557136c8..655fa89d8 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -220,7 +220,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
 	parent_file.ptr = grab_blob(parent, mode, &sz);
 	parent_file.size = sz;
 	memset(&xpp, 0, sizeof(xpp));
-	xpp.flags = XDF_NEED_MINIMAL;
+	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	memset(&state, 0, sizeof(state));
 	state.nmask = nmask;