diff --git a/builtin/checkout.c b/builtin/checkout.c
index 24b67d5dea437ef05af2ca78419f16e6ecd12656..4d36b2897fc4a31795261194a681266dd3a502be 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);