summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-05 14:53:13 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-05 14:53:13 +0900
commit7e5712f7521704937039a5af0af6ddb080c63ffd (patch)
tree53779b468174bd9cf0f2ff38772dbf8d87ca74c0 /git-merge-index.html
parent139b7d1a5a53f1b27057bbb37a7a4a14959f6a79 (diff)
downloadgit-htmldocs-7e5712f7521704937039a5af0af6ddb080c63ffd.tar.gz
Autogenerated HTML docs for v2.15.0-rc0
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 50be0c9be..53f3310e2 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -850,7 +850,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 2013-08-20 08:40:27 PDT
+Last updated 2013-08-21 00:40:27 JST
</div>
</div>
</body>