Git 1.8.2-rc1

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3bb53da522b14fd2aedbebf1bbd92b5d20782c71..bbba728d09bbb578f86c1ef171d24b53c1178fa3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -182,7 +182,7 @@ advice.*::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
        resolveConflict::
-               Advices shown by various commands when conflicts
+               Advice shown by various commands when conflicts
                prevent the operation from being performed.
        implicitIdentity::
                Advice on how to set your identity configuration when