summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-04-04 18:38:30 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-04-04 18:38:30 +0000
commit20f64da93ef6dd18600ba88b89571564f066949b (patch)
tree3f71d251ca97491cbca7acd10ac47a8b0bfc062a /git-merge-one-file.html
parent4c6aa8ab8c3880539b84b60551d17e08c9096fda (diff)
downloadgit-htmldocs-20f64da93ef6dd18600ba88b89571564f066949b.tar.gz
Autogenerated HTML docs for v1.5.1-31-ge421f
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 f61f8b2da..b5ea8cad4 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 19-Jan-2007 00:37:25 UTC
+Last updated 04-Apr-2007 18:33:51 UTC
</div>
</div>
</body>