diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
| commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
| tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-merge-one-file.html | |
| parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
| download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz | |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-merge-one-file.html')
| -rw-r--r-- | git-merge-one-file.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 1ebb06171..03bcedfd2 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -276,8 +276,8 @@ git-merge-one-file(1) Manual Page </div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
-<p>This is the standard helper program to use with "git-merge-index"
-to resolve a merge after the trivial merge done with "git-read-tree -m".</p>
+<p>This is the standard helper program to use with <tt>git-merge-index</tt>
+to resolve a merge after the trivial merge done with <tt>git-read-tree -m</tt>.</p>
</div>
<h2>Author</h2>
<div class="sectionbody">
@@ -294,7 +294,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:54 UTC
+Last updated 02-Jul-2008 03:01:53 UTC
</div>
</div>
</body>
|