X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-file.c;h=afd2ea7a732460c431328dbd4c0141a49d638244;hb=264b774ba6b27cc07ef4c33d52e491d9abf029bb;hp=96edb97a8327ba64cccf64bfa341e94d9f903e94;hpb=7d71be242d7fc8bd2eaef90e1848d71609c5c577;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 96edb97a8..afd2ea7a7 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) {