merge-recursive --renormalize

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index b71712473ed13020bca3f133ea4a28c5081b7f9e..15c7e794f4adaccb8885683946a9f4e7e4dc92c2 100644 (file)
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -19,7 +19,7 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
 git-diff-files [<pattern>...]::
         compares the index and the files on the filesystem.
 
-The "git-diff-tree" command begins its ouput by printing the hash of
+The "git-diff-tree" command begins its output by printing the hash of
 what is being compared. After that, all the commands print one output
 line per changed file.