am: suppress apply errors when using 3-way

diff --git a/builtin-rm.c b/builtin-rm.c
index 269d60890ac6732f05b835e88bdb60a10bb3d441..0cc491271846214d73d55a4f528c8854e0460c8f 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -157,7 +157,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
        git_config(git_default_config, NULL);
 
-       argc = parse_options(argc, argv, builtin_rm_options, builtin_rm_usage, 0);
+       argc = parse_options(argc, argv, prefix, builtin_rm_options,
+                            builtin_rm_usage, 0);
        if (!argc)
                usage_with_options(builtin_rm_usage, builtin_rm_options);