diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 18:20:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 18:20:46 (GMT) |
| commit | 39b5977b1391b0ee1fdfecf04955c32192f64936 (patch) | |
| tree | 14edbf7a75770c0123741e771b990ba5a8a3ce63 /builtin/merge-tree.c | |
| parent | d5c48c531816102d3a86fd807fb19e661a3787d5 (diff) | |
| parent | 582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff) | |
| download | git-39b5977b1391b0ee1fdfecf04955c32192f64936.zip git-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.gz git-39b5977b1391b0ee1fdfecf04955c32192f64936.tar.bz2 | |
Merge branch 'rs/diff-no-minimal'
* rs/diff-no-minimal:
git diff too slow for a file
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index a4a4f2c..fc00d79 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -106,7 +106,7 @@ static void show_diff(struct merge_list *entry) xdemitconf_t xecfg; xdemitcb_t ecb; - xpp.flags = XDF_NEED_MINIMAL; + xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; ecb.outf = show_outf; |