summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:20:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:20:46 (GMT)
commit39b5977b1391b0ee1fdfecf04955c32192f64936 (patch)
tree14edbf7a75770c0123741e771b990ba5a8a3ce63 /builtin/merge-file.c
parentd5c48c531816102d3a86fd807fb19e661a3787d5 (diff)
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff)
downloadgit-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-file.c')
-rw-r--r--builtin/merge-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 610849a..b8e9e5b 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -25,7 +25,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
const char *names[3] = { NULL, NULL, NULL };
mmfile_t mmfs[3];
mmbuffer_t result = {NULL, 0};
- xmparam_t xmp = {{XDF_NEED_MINIMAL}};
+ xmparam_t xmp = {{0}};
int ret = 0, i = 0, to_stdout = 0;
int quiet = 0;
int nongit;