Autogenerated HTML docs for v1.6.0-rc2-22-g71b9

1 files changed, 4 insertions, 4 deletions

diff --git a/git-rerere.html b/git-rerere.html
index 95331b9ac..acbd5d8a5 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -418,14 +418,14 @@ One way to do it is to pull master into the topic branch:</p></div>
 </div></div>

 <div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same

 file; you need to resolve the conflicts when creating the commit

-marked with <tt>+</tt>.  Then you can test the result to make sure your

+marked with <tt>&#43;</tt>.  Then you can test the result to make sure your

 work-in-progress still works with what is in the latest master.</p></div>

 <div class="para"><p>After this test merge, there are two ways to continue your work

 on the topic.  The easiest is to build on top of the test merge

-commit <tt><tt></tt>, and when your work in the topic branch is finally

+commit <tt>&#43;</tt>, and when your work in the topic branch is finally

 ready, pull the topic branch into master, and/or ask the

 upstream to pull from you.  By that time, however, the master or

-the upstream might have been advanced since the test merge <tt></tt></tt>,

+the upstream might have been advanced since the test merge <tt>&#43;</tt>,

 in which case the final commit graph would look like this:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -529,7 +529,7 @@ conflict.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-07-24 04:02:42 UTC

+Last updated 2008-08-10 03:55:20 UTC

 </div>

 </div>

 </body>