diff options
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index beb0623d56..c84c6e05e9 100644 --- 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); } |