X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=f7f4533926e35867725db00f0c89522c4b290898;hb=18e051a3981f38db08521bb61ccf7e4571335353;hp=fd34d76e1516b2c944778a11a5670d382f245873;hpb=28bf4ba014c9b41679f41580fa9e1cc294b240d9;p=git.git

diff --git a/merge-file.c b/merge-file.c
index fd34d76e1..f7f453392 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -30,8 +30,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 +66,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;