X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=7845528e88eea6a42f914b5bf596473eb33dea40;hb=fdec2eb8ebbf995a77e2ab9971565c792b52944a;hp=fd34d76e1516b2c944778a11a5670d382f245873;hpb=c444c16589f95ac22d8e3ffe603cd7f0613512ce;p=git.git

diff --git a/merge-file.c b/merge-file.c
index fd34d76e1..7845528e8 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -3,6 +3,7 @@
 #include "xdiff-interface.h"
 #include "ll-merge.h"
 #include "blob.h"
+#include "merge-file.h"
 
 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 {
@@ -30,8 +31,14 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
 	int merge_status;
 	mmbuffer_t res;
 
-	merge_status = ll_merge(&res, path, base,
-				our, ".our", their, ".their", 0);
+	/*
+	 * This function is only used by cmd_merge_tree, which
+	 * does not respect the merge.conflictstyle option.
+	 * There is no need to worry about a label for the
+	 * common ancestor.
+	 */
+	merge_status = ll_merge(&res, path, base, NULL,
+				our, ".our", their, ".their", NULL);
 	if (merge_status < 0)
 		return NULL;
 
@@ -60,7 +67,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	xdemitcb_t ecb;
 
 	memset(&xpp, 0, sizeof(xpp));
-	xpp.flags = XDF_NEED_MINIMAL;
+	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
 	xecfg.flags = XDL_EMIT_COMMON;