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

diff --git a/merge-file.c b/merge-file.c
index db4d0d50d..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)
 {
@@ -37,7 +38,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;