Autogenerated HTML docs for v1.6.1-rc3-38-gec9f0

1 files changed, 6 insertions, 7 deletions

diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html
index ae524c190..2501ba419 100644
--- a/gitcore-tutorial.html
+++ b/gitcore-tutorial.html
@@ -1170,7 +1170,7 @@ file, which had no differences in the <tt>mybranch</tt> branch), and say:</p></d
 <div class="content">

 <pre><tt>        Auto-merging hello

         CONFLICT (content): Merge conflict in hello

-        Automatic merge failed; fix up by hand</tt></pre>

+        Automatic merge failed; fix conflicts and then commit the result.</tt></pre>

 </div></div>

 <div class="para"><p>It tells you that it did an "Automatic merge", which

 failed due to conflicts in <tt>hello</tt>.</p></div>

@@ -1265,7 +1265,7 @@ would be different)</p></div>
 <div class="listingblock">

 <div class="content">

 <pre><tt>Updating from ae3a2da... to a80b4aa....

-Fast forward

+Fast forward (no commit created; -m option ignored)

  example |    1 +

  hello   |    1 +

  2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre>

@@ -1553,9 +1553,8 @@ file, using 3-way merge.  This is done by giving
 <div class="listingblock">

 <div class="content">

 <pre><tt>$ git merge-index git-merge-one-file hello

-Auto-merging hello.

-merge: warning: conflicts during merge

-ERROR: Merge conflict in hello.

+Auto-merging hello

+ERROR: Merge conflict in hello

 fatal: merge program failed</tt></pre>

 </div></div>

 <div class="para"><p><em>git-merge-one-file</em> script is called with parameters to

@@ -1744,7 +1743,7 @@ never.</td>
 </tr></table>

 </div>

 <div class="para"><p>If you run <tt>git repack</tt> again at this point, it will say

-"Nothing to pack". Once you continue your development and

+"Nothing new to pack.". Once you continue your development and

 accumulate the changes, running <tt>git repack</tt> again will create a

 new pack, that contains objects created since you packed your

 repository the last time. We recommend that you pack your project

@@ -2041,7 +2040,7 @@ to follow, not easier.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-12-10 08:33:33 UTC

+Last updated 2008-12-19 21:37:57 UTC

 </div>

 </div>

 </body>