X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=c336c93c01c0bad76d6189065f0e6630d0b7f5af;hb=c42b00c8f2b8c04ff9829e88dcde92d7294cd460;hp=fd34d76e1516b2c944778a11a5670d382f245873;hpb=507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d;p=git.git

diff --git a/merge-file.c b/merge-file.c
index fd34d76e1..c336c93c0 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -30,7 +30,13 @@ 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,
+	/*
+	 * 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", 0);
 	if (merge_status < 0)
 		return NULL;