summaryrefslogtreecommitdiffstats
path: root/git-merge-file.html
diff options
context:
space:
mode:
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 f4e828267..9880a987c 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-16 05:58:55 JST
</div>
</div>
</body>