diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-08-02 07:23:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-08-02 07:23:38 +0000 |
| commit | 092f5f02b5ca9e56e35050fd479495f5018b94b1 (patch) | |
| tree | 35948c87d22eab4e01256a3598f5ad6b362e212e /git-merge.html | |
| parent | 0ddc94d36eb0eafd58ec0e269e48d13d959558a7 (diff) | |
| download | git-htmldocs-092f5f02b5ca9e56e35050fd479495f5018b94b1.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc3-120-g68d422
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-merge.html b/git-merge.html index c8e8e58dc..888d57bc6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -506,23 +506,23 @@ pull after you are done and ready.</p> <ol>
<li>
<p>
-the results are updated both in the index file and in your
- working tree,
+The results are updated both in the index file and in your
+ working tree;
</p>
</li>
<li>
<p>
-index file is written out as a tree,
+Index file is written out as a tree;
</p>
</li>
<li>
<p>
-the tree gets committed, and
+The tree gets committed; and
</p>
</li>
<li>
<p>
-the <tt>HEAD</tt> pointer gets advanced.
+The <tt>HEAD</tt> pointer gets advanced.
</p>
</li>
</ol>
@@ -606,7 +606,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:09:46 UTC
+Last updated 02-Aug-2007 07:23:09 UTC
</div>
</div>
</body>
|