diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:20:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:20:46 -0700 |
| commit | 39b5977b1391b0ee1fdfecf04955c32192f64936 (patch) | |
| tree | 14edbf7a75770c0123741e771b990ba5a8a3ce63 /merge-file.c | |
| parent | d5c48c531816102d3a86fd807fb19e661a3787d5 (diff) | |
| parent | 582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff) | |
| download | git-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.gz | |
Merge branch 'rs/diff-no-minimal'
* rs/diff-no-minimal:
git diff too slow for a file
Diffstat (limited to 'merge-file.c')
| -rw-r--r-- | merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-file.c b/merge-file.c index c336c93c01..db4d0d50d3 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; |