X-Git-Url: https://git.uis.cam.ac.uk/x/uis/git/git.git/blobdiff_plain/635a7bb1d807390bedfc1147d2052e8423bcd1e0..712516bcacacd45b4825ec649f15c3573f6fb42a:/builtin/checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 24b67d5dea..4d36b2897f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -155,7 +155,7 @@ static int checkout_merged(int pos, struct checkout *state)
 	 * merge.renormalize set, too
 	 */
 	status = ll_merge(&result_buf, path, &ancestor, "base",
-			  &ours, "ours", &theirs, "theirs", 0);
+			  &ours, "ours", &theirs, "theirs", NULL);
 	free(ancestor.ptr);
 	free(ours.ptr);
 	free(theirs.ptr);