diff --git a/merge-file.c b/merge-file.c
index db4d0d50d32d8852d1cb5173125e4173c3badb49..7845528e88eea6a42f914b5bf596473eb33dea40 100644 (file)
--- a/merge-file.c
+++ b/merge-file.c
#include "xdiff-interface.h"
#include "ll-merge.h"
#include "blob.h"
#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)
{
static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
{
* common ancestor.
*/
merge_status = ll_merge(&res, path, base, NULL,
* 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;
if (merge_status < 0)
return NULL;