Autogenerated HTML docs for v1.6.2-rc0-10-gf6b9

1 files changed, 3 insertions, 2 deletions

diff --git a/gitk.html b/gitk.html
index 32aca30e0..2bdcad7bb 100644
--- a/gitk.html
+++ b/gitk.html
@@ -380,7 +380,8 @@ frequently used options.</p></div>
 <p>

         After an attempt to merge stops with conflicts, show the commits on

         the history between two branches (i.e. the HEAD and the MERGE_HEAD)

-        that modify the conflicted files.

+        that modify the conflicted files and do not exist on all the heads

+        being merged.

 </p>

 </dd>

 <dt>

@@ -513,7 +514,7 @@ such as display options, font, and colors.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-12-20 06:29:42 UTC

+Last updated 2009-02-09 18:05:36 UTC

 </div>

 </div>

 </body>