summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-16 13:19:04 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-16 13:19:04 -0800
commitd2309374057e387bf3b3f77ed51de90c6f1af162 (patch)
treea15f0f4e987a56b325efb7dc0ab40794bd0ee777 /git-merge-index.html
parent7657f149df9d40ac2a9193b88f2e7f0b7c9dc532 (diff)
downloadgit-htmldocs-d2309374057e387bf3b3f77ed51de90c6f1af162.tar.gz
Autogenerated HTML docs for v2.39.0-227-g262c45
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 d4128b431..2cedbc821 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
- 2021-12-11 07:52:02 JST
+ 2021-12-10 14:52:02 PST
</div>
</div>
</body>