Merge branch 'ar/unlink-err' into maint

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 88e2697aebf11399baf9f9c8b5a63b06a0f83c1d..da2daf45acd2154b7f00da34d41a5ab8acaf0c38 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -512,7 +512,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 
        pathspec = get_pathspec(prefix, argv);
 
-       /* be nice with submodule patsh ending in a slash */
+       /* be nice with submodule paths ending in a slash */
        read_cache();
        if (pathspec)
                strip_trailing_slash_from_submodules();