diff options
Diffstat (limited to 'git-merge-one-file.html')
| -rw-r--r-- | git-merge-one-file.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 907a4010f..1c961f491 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -772,7 +772,7 @@ to resolve a merge after the trivial merge done with <em>git read-tree -m</em>.< <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-11 07:02:33 JST
+ 2020-03-10 15:02:33 PDT
</div>
</div>
</body>
|