summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-10-03 08:41:56 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-10-03 08:41:56 +0000
commitd97409fc4bcfdafd3ecae712910cd74ae8bf4d6e (patch)
treec941809e51704bbb1630853160c7af3ec23c1f84 /git-merge-one-file.html
parent4e2d8818ee46c54a54c1ee0d454a8459b581f18e (diff)
downloadgit-htmldocs-d97409fc4bcfdafd3ecae712910cd74ae8bf4d6e.tar.gz
Autogenerated HTML docs for v1.4.2.3-g128e
Diffstat (limited to 'git-merge-one-file.html')
-rw-r--r--git-merge-one-file.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index 40fd65880..4d41669d0 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -294,7 +294,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jul-2006 01:37:55 UTC
+Last updated 03-Oct-2006 08:41:13 UTC
</div>
</div>
</body>