X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=28046a998426e88dec9ad6ab431624bb41a81ce1;hb=541d1fa85ca4741e8b6db281f3d788dcfc423bdc;hp=1467ad31795ae21896f1e608e7cb032df2bc94a8;hpb=276e017f2f632e9bd954bd5a6b794fe0865a5f37;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index 1467ad317..28046a998 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -359,7 +359,7 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
 	read_mmblob(&remote, p->remote);
 
 	status = ll_merge(&result_buf, sha1_to_hex(p->obj), &base, NULL,
-			  &local, o->local_ref, &remote, o->remote_ref, 0);
+			  &local, o->local_ref, &remote, o->remote_ref, NULL);
 
 	free(base.ptr);
 	free(local.ptr);