summaryrefslogtreecommitdiffstats
path: root/git-merge-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-12-09 17:43:11 -0800
committerJunio C Hamano <gitster@pobox.com>2023-12-09 17:43:11 -0800
commit9c919c74b7fda282913220a8f9af0f70d47a194c (patch)
treeef5a6d931bdfdaed6c82dc6faa0eca37857d0a53 /git-merge-file.html
parentcb119ab9d01a5ead330e94756b310ca384219570 (diff)
downloadgit-htmldocs-9c919c74b7fda282913220a8f9af0f70d47a194c.tar.gz
Autogenerated HTML docs for v2.43.0-76-g1a87c
Diffstat (limited to 'git-merge-file.html')
-rw-r--r--git-merge-file.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-file.html b/git-merge-file.html
index eb821bc5d..ab5fed58c 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -919,7 +919,7 @@ object store and the object ID of its blob is written to standard output.</p></d
<div id="footer">
<div id="footer-text">
Last updated
- 2023-11-09 02:04:31 JST
+ 2023-11-08 09:04:31 PST
</div>
</div>
</body>