summaryrefslogtreecommitdiffstats
path: root/git-merge-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-11-21 15:55:27 +0900
committerJunio C Hamano <gitster@pobox.com>2022-11-21 15:55:27 +0900
commitcb582cab761661d1b94a09a4a78c20a3d29c9744 (patch)
treef48eb9cacd3efb722cb71adb47b0cf360dcd6250 /git-merge-index.html
parentc429c188841b43691e7fa5b85f5e94514ae72299 (diff)
downloadgit-htmldocs-cb582cab761661d1b94a09a4a78c20a3d29c9744.tar.gz
Autogenerated HTML docs for v2.38.1-473-ga07895
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 2cedbc821..d4128b431 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-10 14:52:02 PST
+ 2021-12-11 07:52:02 JST
</div>
</div>
</body>