diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 14:38:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 14:38:50 +0200 |
| commit | 60335534a6ac52d4d3a372a5b56df5a57a4463d1 (patch) | |
| tree | 8d61494762039a2268c3116574841fe71181054b /combine-diff.c | |
| parent | Merge branch 'bg/apply-blank-trailing-context' into maint (diff) | |
| parent | git diff too slow for a file (diff) | |
| download | git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.xz git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.zip | |
Merge branch 'rs/diff-no-minimal' into maint
* rs/diff-no-minimal:
git diff too slow for a file
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 7557136c82..655fa89d8a 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; |