Merge branch 'cc/maint-diff-CC-binary' into maint

[git.git] / builtin / merge-file.c

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 65eb790fd0ac0cf5c7c267aacd521a632ac73a0c..b8e9e5ba01658bbdd6e9d712b00da902b6f33fbe 100644 (file)
--- 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;
@@ -77,6 +77,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
                                        argv[i]);
        }
 
+       xmp.ancestor = names[1];
        xmp.file1 = names[0];
        xmp.file2 = names[2];
        ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);