xdl_merge(): introduce xmparam_t for merge specific parameters

[git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index d92990a6bba01c321bb67bd07287772075f6994a..adb069481ce3c253dca4de7eed2a07990a6d61c7 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -332,7 +332,7 @@ static int merge(const char *name, const char *path)
        int ret;
        mmfile_t cur, base, other;
        mmbuffer_t result = {NULL, 0};
-       xpparam_t xpp = {XDF_NEED_MINIMAL};
+       xmparam_t xmp = {{XDF_NEED_MINIMAL}};
 
        if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
                return 1;
@@ -342,7 +342,7 @@ static int merge(const char *name, const char *path)
                        read_mmfile(&other, rerere_path(name, "postimage")))
                return 1;
        ret = xdl_merge(&base, &cur, "", &other, "",
-                       &xpp, XDL_MERGE_ZEALOUS, &result);
+                       &xmp, XDL_MERGE_ZEALOUS, &result);
        if (!ret) {
                FILE *f = fopen(path, "w");
                if (!f)