Merge branch 'tg/worktree-create-tracking'

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index beb0623d56323a0ea8912e54e94e66fa07268156..c84c6e05e922f09692b9b133cd391b850c7951df 100644 (file)
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -26,7 +26,7 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix)
         */
        if (read_cache() < 0)
                die_errno("read_cache failed");
-       if (index_differs_from("HEAD", 0, 0))
+       if (index_differs_from("HEAD", NULL, 0))
                exit(2);
        exit(0);
 }