Autogenerated man pages for v1.1.6-g97f5

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 76200294142bc7edbf93773770d5d757f2f41dbd..32ddcc566d18308494e36d99fe67356b97678316 100755 (executable)
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -156,7 +156,7 @@ git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag s
 
 .TP
 \-c,\-\-cc
-These flags change the way a merge commit is displayed (which means it is useful only when the command is given one <tree\-ish>, or \-\-stdin)\&. It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which \-m option output does\&. \-\-cc further compresses the output by omiting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, unless \-m is specified\&.
+These flags change the way a merge commit is displayed (which means it is useful only when the command is given one <tree\-ish>, or \-\-stdin)\&. It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which \-m option output does\&. \-\-cc further compresses the output by omiting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, just like any other "empty diff" cases\&.
 
 .SH "LIMITING OUTPUT"