summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-04-02 06:52:03 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-04-02 06:52:03 +0000
commit9572e92f03dbe32702c906280c22868b3b57caa4 (patch)
treef53f3bc945a1ce27df7614b1db532ed83ce19d5b /git-merge-one-file.html
parent0706c80eb5150908b5a08c163848c7e9328923b4 (diff)
downloadgit-htmldocs-9572e92f03dbe32702c906280c22868b3b57caa4.tar.gz
Autogenerated HTML docs for v1.6.2.1-469-gdffc
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 6395fb7ef..0e10857f5 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 2009-02-14 08:18:25 UTC
+Last updated 2009-04-02 06:49:57 UTC
</div>
</div>
</body>