X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fcheckout.c;h=9240fafb2ad17505bf407363e058d208a8a70497;hb=5c28a8b054cb69a37638b0261fc370422c8fab58;hp=a54583b3a4936b341820cf5c639e5647ce456a5a;hpb=02ef0ed7102a197e2b746f3e694c09915fa98060;p=git.git

diff --git a/builtin/checkout.c b/builtin/checkout.c
index a54583b3a..9240fafb2 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -161,7 +161,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);