Merge branch 'hg/maint-attr-fix' into maint

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

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 65eb790fd0ac0cf5c7c267aacd521a632ac73a0c..610849a6533c6fd2d3d2e8d3f8d233757174aabd 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -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);