From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 22 Nov 2006 08:28:50 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.4-g5942
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0df3434818ed2fc0bf60acd6b5a3a925d95d349d;p=git.git

Autogenerated HTML docs for v1.4.4-g5942
---

diff --git a/tutorial.html b/tutorial.html
index 2095a2842..9ef23928a 100644
--- 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>
 </div></div>
 <p>at this point the two branches have diverged, with different changes
-made in each.  To merge the changes made in the two branches, run</p>
+made in each.  To merge the changes made in experimental into master, run</p>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git pull . experimental</tt></pre>
@@ -701,7 +701,7 @@ digressions that may be interesting at this point are:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:42 UTC
+Last updated 22-Nov-2006 08:28:42 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial.txt b/tutorial.txt
index 554ee0af9..1e4ddfbd1 100644
--- 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