summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-17 12:33:59 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-17 12:33:59 -0800
commit02194af879b3d6ac73715fc296d5d9d68b7f8610 (patch)
treeacda5718f44edc42739f0cbab2d5b7198e7d4fd8 /git-merge-index.html
parent94a43ffc0ca2328ab27e9c110d9d360a5061c65f (diff)
downloadgit-htmldocs-02194af879b3d6ac73715fc296d5d9d68b7f8610.tar.gz
Autogenerated HTML docs for v1.7.8-rc3
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 54d439ab7..61a4434b6 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -678,7 +678,7 @@ for the AA file, because it didn&#8217;t exist in the original, and thus
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-09-21 23:01:14 PDT
+Last updated 2011-11-15 13:45:02 PDT
</div>
</div>
</body>