Merge branch 'jc/merge-refuse-new-root'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0e08f567a163571c7d8f2a4c10984691f5aba566..75c3f4157d845876a91f04f955878a3affc9bd6e 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -155,7 +155,7 @@ a space) at the start of each line:
        <eolinfo> is either "-text", "none", "lf", "crlf", "mixed" or "".
 +
 "" means the file is not a regular file, it is not in the index or
-not accessable in the working tree.
+not accessible in the working tree.
 +
 <eolattr> is the attribute that is used when checking out or committing,
 it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".