summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
commit35738e87105e1a11ced6a6b497146bbd189d4fb2 (patch)
tree352f4473f85ea0e327b3a0e3b9739d80f8462eb9 /git-merge-one-file.html
parent14b76487ff861981455b320a2c6d17632997773e (diff)
downloadgit-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
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 e71100b69..2bda0b361 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 14-Nov-2007 12:11:37 UTC
+Last updated 07-Jan-2008 07:50:32 UTC
</div>
</div>
</body>