diff options
Diffstat (limited to 'builtin-merge-file.c')
| -rw-r--r-- | builtin-merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 96edb97a83..afd2ea7a73 100644 --- a/builtin-merge-file.c +++ b/builtin-merge-file.c @@ -48,7 +48,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) merge_style = git_xmerge_style; } - argc = parse_options(argc, argv, options, merge_file_usage, 0); + argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); if (argc != 3) usage_with_options(merge_file_usage, options); if (quiet) { |