Merge branch 'ap/svn'

diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt
index b95f99be6c34ccb7e8583a68d1b1c75a1bf653ca..1e188e6e742d06056fcd8eafd89c13ef36685d4e 100644 (file)
--- a/Documentation/i18n.txt
+++ b/Documentation/i18n.txt
@@ -22,7 +22,7 @@ does not forbid it.  However, there are a few things to keep in
 mind.
 
 . `git-commit-tree` (hence, `git-commit` which uses it) issues
-  an warning if the commit log message given to it does not look
+  a warning if the commit log message given to it does not look
   like a valid UTF-8 string, unless you explicitly say your
   project uses a legacy encoding.  The way to say this is to
   have i18n.commitencoding in `.git/config` file, like this: