X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=f7f4533926e35867725db00f0c89522c4b290898;hb=ad5aeeded3295589b2573b143f754762a56f8f82;hp=db4d0d50d32d8852d1cb5173125e4173c3badb49;hpb=267684f0b7428583ba88c4acc0e9ef322a36b3ff;p=git.git

diff --git a/merge-file.c b/merge-file.c
index db4d0d50d..f7f453392 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -37,7 +37,7 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
 	 * common ancestor.
 	 */
 	merge_status = ll_merge(&res, path, base, NULL,
-				our, ".our", their, ".their", 0);
+				our, ".our", their, ".their", NULL);
 	if (merge_status < 0)
 		return NULL;