Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
imap-send: build imap-send on Windows
[gitweb.git]
/
builtin-merge-file.c
diff --git
a/builtin-merge-file.c
b/builtin-merge-file.c
index 96edb97a8327ba64cccf64bfa341e94d9f903e94..afd2ea7a732460c431328dbd4c0141a49d638244 100644
(file)
--- 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) {