Autogenerated HTML docs for v1.4.4-g5942

diff --git a/tutorial.html b/tutorial.html
index 2095a2842e91da34c6b41dd04c740cbc5e75a424..9ef23928a6c384722f8bfbbc6d7304cfaef0fa73 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -382,7 +382,7 @@ made on the experimental branch and you're back on the master branch.</p>
 $ git commit -a</tt></pre>\r
 </div></div>\r
 <p>at this point the two branches have diverged, with different changes\r
-made in each.  To merge the changes made in the two branches, run</p>\r
+made in each.  To merge the changes made in experimental into master, run</p>\r
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>$ git pull . experimental</tt></pre>\r
@@ -701,7 +701,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:42 UTC\r
+Last updated 22-Nov-2006 08:28:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.txt b/tutorial.txt
index 554ee0af912368cb842d93c025e742daaf47f5f2..1e4ddfbd114dde8949dc53d423715673a748854f 100644 (file)
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -141,7 +141,7 @@ $ git commit -a
 ------------------------------------------------
 
 at this point the two branches have diverged, with different changes
-made in each.  To merge the changes made in the two branches, run
+made in each.  To merge the changes made in experimental into master, run
 
 ------------------------------------------------
 $ git pull . experimental