summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-19 02:14:50 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-19 02:14:50 +0000
commitbb6e0789b38b1d3ecb600a1ff05cdff4b88f677c (patch)
tree902103a829e9f09e4159ada8fdc32c6c0ed00ffb /git-merge-one-file.html
parent18b6ff3704218dde27a820b56b39d02b6edb62ea (diff)
downloadgit-htmldocs-bb6e0789b38b1d3ecb600a1ff05cdff4b88f677c.tar.gz
Autogenerated HTML docs for v1.5.3-rc2-19-gc4fba
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 d6de2cd16..d65d20ab3 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 16-Jun-2007 09:49:12 UTC
+Last updated 19-Jul-2007 02:09:46 UTC
</div>
</div>
</body>