From: Junio C Hamano
Date: Thu, 2 Feb 2006 23:50:18 +0000 (-0800)
Subject: Autogenerated HTML docs for v1.1.6-g97f5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1b6885b7318aaa1056c576da3463baf923f55148;p=git.git
Autogenerated HTML docs for v1.1.6-g97f5
---
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 036370e5..f44a2fc2 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -564,7 +564,7 @@ separated with a single space are given.
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.
+ message is not shown, just like any other "empty diff" cases.
@@ -930,7 +930,7 @@ two unresolved merge parents with the working tree file