summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-13 17:40:50 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-13 17:40:50 -0700
commit91a411f3c81ee50b7d9a6476828a238397f5456a (patch)
treecda6c1078bce41f3d9e19475a1e8d105a8401077 /git-merge-index.html
parent01009d54ee08e7b28b2cd86ae8c30f8adaf00d89 (diff)
downloadgit-htmldocs-91a411f3c81ee50b7d9a6476828a238397f5456a.tar.gz
Autogenerated HTML docs for v2.32.0-264-g75ae1
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 441bedce6..dbf458509 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -852,7 +852,7 @@ for the AA file, because it didn&#8217;t exist in the original, and thus
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-11 00:03:13 JST
+ 2020-03-10 08:03:13 PDT
</div>
</div>
</body>