summaryrefslogtreecommitdiffstats
path: root/git-merge.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.html')
-rw-r--r--git-merge.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html
index facf99ff6..434551199 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -2327,7 +2327,7 @@ merge.<driver>.recursive
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-22 10:52:14 JST
+ 2023-01-21 17:52:14 PST
</div>
</div>
</body>