am: suppress apply errors when using 3-way

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 3d59b0e140ca199997704ffcf59fbc2138345168..2312866605c4140ac4e5a9f5bb963ca5ab5c6da3 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -486,7 +486,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
                prefix_offset = strlen(prefix);
        git_config(git_default_config, NULL);
 
-       argc = parse_options(argc, argv, builtin_ls_files_options,
+       argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
                        ls_files_usage, 0);
        if (show_tag || show_valid_bit) {
                tag_cached = "H ";