diff --git a/builtin/checkout.c b/builtin/checkout.c
index a54583b3a4936b341820cf5c639e5647ce456a5a..9240fafb2ad17505bf407363e058d208a8a70497 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
* 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);