Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 6aa1be04787b998d12b873afc98d9b498c942363..67a90a828c04b7277fc603c6518fd0ecd8247d32 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -54,7 +54,7 @@ and accumulating child directory counts in the parent directories:
 
 diff.statGraphWidth::
        Limit the width of the graph part in --stat output. If set, applies
-       to all commands generating --stat outuput except format-patch.
+       to all commands generating --stat output except format-patch.
 
 diff.external::
        If this config variable is set, diff generation is not