summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 12:38:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-21 12:38:50 (GMT)
commit60335534a6ac52d4d3a372a5b56df5a57a4463d1 (patch)
tree8d61494762039a2268c3116574841fe71181054b /builtin/merge-tree.c
parente1ba0f6340c1d72677c7792a0a82ecf05363026e (diff)
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff)
downloadgit-60335534a6ac52d4d3a372a5b56df5a57a4463d1.zip
git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.gz
git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.bz2
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.c2
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;