diff options
Diffstat (limited to 'builtin/merge-index.c')
| -rw-r--r-- | builtin/merge-index.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 452f833ac4..ab16e70f23 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -1,5 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "hex.h" +#include "repository.h" #include "run-command.h" static const char *pgm; @@ -70,7 +72,7 @@ static void merge_all(void) } } -int cmd_merge_index(int argc, const char **argv, const char *prefix) +int cmd_merge_index(int argc, const char **argv, const char *prefix UNUSED) { int i, force_file = 0; |