Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'wc/rebase-insn'
[gitweb.git]
/
merge-file.c
diff --git
a/merge-file.c
b/merge-file.c
index 748d15c0e04c0d63fbe586ad59c795ddaf3dec92..1e031eafe0c70eec092a53e8ab291b9887622b0e 100644
(file)
--- a/
merge-file.c
+++ b/
merge-file.c
@@
-62,6
+62,7
@@
static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
xdemitcb_t ecb;
xpp.flags = XDF_NEED_MINIMAL;
+ memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
xecfg.flags = XDL_EMIT_COMMON;
ecb.outf = common_outf;