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 /builtin/rerere.c | |
parent | Merge branch 'maint' (diff) | |
parent | git diff too slow for a file (diff) | |
download | tgif-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.xz |
Merge branch 'rs/diff-no-minimal'
* rs/diff-no-minimal:
git diff too slow for a file
Diffstat (limited to 'builtin/rerere.c')
-rw-r--r-- | builtin/rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index 34f9acee91..0048f9ef7f 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -89,7 +89,7 @@ static int diff_two(const char *file1, const char *label1, printf("--- a/%s\n+++ b/%s\n", label1, label2); fflush(stdout); memset(&xpp, 0, sizeof(xpp)); - xpp.flags = XDF_NEED_MINIMAL; + xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; ecb.outf = outf; |