http-push: add regression tests

[git.git] / merge-file.c

diff --git a/merge-file.c b/merge-file.c
index 748d15c0e04c0d63fbe586ad59c795ddaf3dec92..2a939c9dd835a7e7946eb1548e4cf637ae3ca329 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;
@@ -70,7 +71,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
        res->size = 0;
 
        ecb.priv = res;
-       return xdl_diff(f1, f2, &xpp, &xecfg, &ecb);
+       return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
 }
 
 void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)