diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 14:07:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 14:07:45 +0900 |
| commit | a8858316fb3186e69d324183d9af58ef55dfb794 (patch) | |
| tree | 4f60790af5953a6a07e822d2b92123ac3263ed3c /git-merge-one-file.html | |
| parent | cb705397f111dc1fcb3e3fa844bfd5b3050dee38 (diff) | |
| download | git-htmldocs-a8858316fb3186e69d324183d9af58ef55dfb794.tar.gz | |
Autogenerated HTML docs for v2.23.0-385-gbc129
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 b177bc14d..404cded08 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
- 2018-01-26 15:11:04 PST
+ 2018-01-27 08:11:04 JST
</div>
</div>
</body>
|