summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-04-24 02:59:11 +0000
committerJunio C Hamano <junio@kernel.org>2010-04-24 02:59:11 +0000
commitfc5d735affe7604a086875e20ddb8914b473cff9 (patch)
tree09e47447b6eea35e926c49646d001db3ad784dc4 /git-merge-one-file.html
parentf703a396682aedbefbbb53ca51ce10618efabf91 (diff)
downloadgit-htmldocs-fc5d735affe7604a086875e20ddb8914b473cff9.tar.gz
Autogenerated HTML docs for v1.7.1
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 0d26ca176..b9222122c 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -342,7 +342,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.<
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-02-13 00:59:48 UTC
+Last updated 2010-04-24 02:56:00 UTC
</div>
</div>
</body>