diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:38:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:38:50 -0700 |
| commit | 60335534a6ac52d4d3a372a5b56df5a57a4463d1 (patch) | |
| tree | 8d61494762039a2268c3116574841fe71181054b /builtin/merge-tree.c | |
| parent | e1ba0f6340c1d72677c7792a0a82ecf05363026e (diff) | |
| parent | 582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff) | |
| download | git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.gz git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.xz | |
Merge branch 'rs/diff-no-minimal' into maint
* 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 a4a4f2ce4..fc00d794d 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; |