diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-22 09:20:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-22 09:20:44 +0000 |
| commit | 0868a302deebe5253106fdf9af00c82e2c711e66 (patch) | |
| tree | f24a8821760fc2732d75ec72e5527620e5138fa6 /git-merge-one-file.html | |
| parent | 5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (diff) | |
| download | git-htmldocs-0868a302deebe5253106fdf9af00c82e2c711e66.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Diffstat (limited to 'git-merge-one-file.html')
| -rw-r--r-- | git-merge-one-file.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index d40203f53..d28328ac5 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -330,7 +330,7 @@ to resolve a merge after the trivial merge done with <em>git-read-tree -m</em>.< <h2 id="_author">Author</h2>
<div class="sectionbody">
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p></div>
+Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.</p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
@@ -342,7 +342,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:54 UTC
+Last updated 2008-07-22 09:19:12 UTC
</div>
</div>
</body>
|