Merge branch 'jc/test-cvs-no-init-in-existing-dir'

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 89dd634674054b4d0ba485a8010f40581f99d154..4314ad0fbb617b9f4c9c4e3d45f5d08f89259e2b 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -57,8 +57,8 @@ diff.statGraphWidth::
        to all commands generating --stat output except format-patch.
 
 diff.context::
-       Generate diffs with <n> lines of context instead of the default of
-       3. This value is overridden by the -U option.
+       Generate diffs with <n> lines of context instead of the default
+       of 3. This value is overridden by the -U option.
 
 diff.external::
        If this config variable is set, diff generation is not