diff options
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 284eb48609..932924e5d0 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -10,11 +10,12 @@ #include "git-compat-util.h" #include "builtin.h" #include "diff.h" +#include "repository.h" static const char builtin_merge_ours_usage[] = "git merge-ours <base>... -- HEAD <remote>..."; -int cmd_merge_ours(int argc, const char **argv, const char *prefix) +int cmd_merge_ours(int argc, const char **argv, const char *prefix UNUSED) { if (argc == 2 && !strcmp(argv[1], "-h")) usage(builtin_merge_ours_usage); |