summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2009-12-03 02:47:42 +0000
committerJunio C Hamano <junio@kernel.org>2009-12-03 02:47:42 +0000
commit281025ef913d8bcfd5f668ef9d16e82996afc364 (patch)
tree8b990411a1b9f689a7e52ac7f0dc0aafebd81588 /git-merge-index.html
parent96502a3d2ee484d8451744353481280bc673a751 (diff)
downloadgit-htmldocs-281025ef913d8bcfd5f668ef9d16e82996afc364.tar.gz
Autogenerated HTML docs for v1.6.6-rc1-2-g61b8f
Diffstat (limited to 'git-merge-index.html')
-rw-r--r--git-merge-index.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-index.html b/git-merge-index.html
index 357dd25d5..747b70e20 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -420,7 +420,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:12 UTC
+Last updated 2009-12-02 23:19:46 UTC
</div>
</div>
</body>