Merge branch 'maint-1.6.3' into maint-1.6.4

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index fdf8e7b27755e7767550e1ccc33e6f80265244a3..f2cef1260b7f74254b96ce65f8aa55267b618c29 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -63,7 +63,7 @@ and terminated by a newline) is printed before the difference.  When
 comparing commits, the ID of the first (or only) commit, followed by a
 newline, is printed.
 +
-The following flags further affects the behavior when comparing
+The following flags further affect the behavior when comparing
 commits (but not trees).
 
 -m::
@@ -159,8 +159,7 @@ HEAD commits it finds, which is even more interesting.
 
 in case you care).
 
-Output format
--------------
+
 include::diff-format.txt[]