diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 15:08:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 15:08:10 +0900 |
| commit | 4078a55a6fb467915a2f03f271d1390b97eabc13 (patch) | |
| tree | 94f9713738bf23d7a7bce9c87937558570412c71 /git-merge-one-file.html | |
| parent | 9877648272f630de87aeee2e3a8b7f4ac1ad9c70 (diff) | |
| download | git-htmldocs-4078a55a6fb467915a2f03f271d1390b97eabc13.tar.gz | |
Autogenerated HTML docs for v2.31.1-442-g7e391
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 dd931f0e1..414cb47f5 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
- 2013-08-20 08:40:27 PDT
+ 2013-08-21 00:40:27 JST
</div>
</div>
</body>
|