summaryrefslogtreecommitdiffstats
path: root/git-merge-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-14 21:18:50 +0000
committerJunio C Hamano <gitster@pobox.com>2022-03-14 21:18:50 +0000
commit2d50e8cd1cf8be3429eab2e9a8912d18b1b8b2f4 (patch)
tree95000d19975d644915f9fbfac5b54c781a3a17ba /git-merge-file.html
parent7c37da749fa2c8d767b9ddfc2ed43986eb2f4d7c (diff)
downloadgit-htmldocs-2d50e8cd1cf8be3429eab2e9a8912d18b1b8b2f4.tar.gz
Autogenerated HTML docs for v2.35.1-500-gb896f
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 e1c91cbe1..1d727d355 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -894,7 +894,7 @@ implements all of RCS <em>merge</em>'s functionality which is needed by
<div id="footer">
<div id="footer-text">
Last updated
- 2021-12-15 12:58:55 PST
+ 2021-12-15 20:58:55 UTC
</div>
</div>
</body>