X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge-file.c;h=610849a6533c6fd2d3d2e8d3f8d233757174aabd;hb=6e10b9c9999cbbdfae1087a34efd701108acd806;hp=69cc683332a04ddc6959fcef3d2853ccfb2860b8;hpb=b6a7a06aa6f083f21b0fca2558c737324eda1602;p=git.git

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 69cc68333..610849a65 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -77,8 +77,10 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 					argv[i]);
 	}
 
-	ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
-			&xmp, &result);
+	xmp.ancestor = names[1];
+	xmp.file1 = names[0];
+	xmp.file2 = names[2];
+	ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);
 
 	for (i = 0; i < 3; i++)
 		free(mmfs[i].ptr);