summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-07-15 01:38:40 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-07-15 01:38:40 +0000
commit7ccb9fd251897744e84ea1692321ec66a3b0164a (patch)
tree922f59cc1bd4777941a58052d6b014f54d20dd2b /git-merge-index.html
parent9ae1a06fff2c6453541219a122490cd5b60b3088 (diff)
downloadgit-htmldocs-7ccb9fd251897744e84ea1692321ec66a3b0164a.tar.gz
Autogenerated HTML docs for v1.4.1-ga3e6
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 193abe796..e50a819c7 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 04-Jun-2006 07:24:28 UTC
+Last updated 15-Jul-2006 01:37:55 UTC
</div>
</div>
</body>