X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-file.c;h=db4d0d50d32d8852d1cb5173125e4173c3badb49;hb=534930807c230436a2b3f4891df810af0b8c0353;hp=cafc274e2d0438c346ecc6d8df4290b740470756;hpb=582aa00bdffb27abcf1b27d541b4c231a395d3b8;p=git.git

diff --git a/merge-file.c b/merge-file.c
index cafc274e2..db4d0d50d 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;