diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
| commit | 8ef91f31f6606a0370b18943c3b0f089e04873f9 (patch) | |
| tree | 2bf27a3779a34fa4bf69dfc02e1fe1be848ea0d2 /git-merge-one-file.html | |
| parent | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff) | |
| download | git-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz | |
Autogenerated HTML docs for v2.24.0-308-g228f5
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 404cded08..b177bc14d 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-27 08:11:04 JST
+ 2018-01-26 15:11:04 PST
</div>
</div>
</body>
|