Autogenerated HTML docs for v1.3.3-g16a4

[git.git] / git-read-tree.html

diff --git a/git-read-tree.html b/git-read-tree.html
index fa551cf..d159a4c 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -520,7 +520,7 @@ stage 1 and stage 3 are the same and stage 2 is different take
 <p>The <tt>git-write-tree</tt> command refuses to write a nonsensical tree, and it\r
 will complain about unmerged entries if it sees a single entry that is not\r
 stage 0.</p>\r
-<p>Ok, this all sounds like a collection of totally nonsensical rules,\r
+<p>OK, this all sounds like a collection of totally nonsensical rules,\r
 but it's actually exactly what you want in order to do a fast\r
 merge. The different stages represent the "result tree" (stage 0, aka\r
 "merged"), the original tree (stage 1, aka "orig"), and the two trees\r
@@ -548,7 +548,7 @@ a file that has _any_ difference what-so-ever in the three trees
 <p>\r
 the index file saves and restores with all this information, so you\r
   can merge things incrementally, but as long as it has entries in\r
-  stages 1/2/3 (ie "unmerged entries") you can't write the result. So\r
+  stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So\r
   now the merge algorithm ends up being really simple:\r
 </p>\r
 <ul>\r
@@ -649,7 +649,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Mar-2006 09:14:48 UTC\r
+Last updated 04-Jun-2006 07:24:29 UTC\r
 </div>\r
 </div>\r
 </body>\r