Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Enable threaded delta search on Mac OS X/Darwin
[gitweb.git]
/
merge-file.c
diff --git
a/merge-file.c
b/merge-file.c
index 2a939c9dd835a7e7946eb1548e4cf637ae3ca329..3120a95f786eadd4cb5d167facc15714904e9665 100644
(file)
--- a/
merge-file.c
+++ b/
merge-file.c
@@
-61,6
+61,7
@@
static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
xdemitconf_t xecfg;
xdemitcb_t ecb;
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = XDF_NEED_MINIMAL;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;