summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
commite1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (patch)
treea8daa09b76e908903adf7e40a61774563f24da72 /git-merge-one-file.html
parent0ecfa0f3ad17b8a498a5c93dc403de943888e1b8 (diff)
downloadgit-htmldocs-e1b2683fe5d6d67aa52277a7a90966c3cec6ef93.tar.gz
Autogenerated HTML docs for v1.6.5.2-185-gb7fba
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 3f11f1fbc..228626212 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-07-01 02:30:56 UTC
+Last updated 2009-11-15 09:57:12 UTC
</div>
</div>
</body>