diff options
Diffstat (limited to 'builtin/merge-index.c')
| -rw-r--r-- | builtin/merge-index.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 0fabe3f6bb..1309a8ff47 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -73,7 +73,10 @@ static void merge_all(void) } } -int cmd_merge_index(int argc, const char **argv, const char *prefix UNUSED) +int cmd_merge_index(int argc, + const char **argv, + const char *prefix UNUSED, + struct repository *repo UNUSED) { int i, force_file = 0; |