diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-28 15:20:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 15:20:52 -0800 |
| commit | 68e72b77e38cd977e75ab3e6e439a98a1d80e5d8 (patch) | |
| tree | cd4002833c27711c19ca04f5baae1177179dcc94 /git-merge-one-file.html | |
| parent | 0f1291dcb49cd80bdb333eecb5f978a6a5ac3818 (diff) | |
| download | git-htmldocs-68e72b77e38cd977e75ab3e6e439a98a1d80e5d8.tar.gz | |
Autogenerated HTML docs for v2.16.0-rc0
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 8df6e8989..c0dad6711 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -770,7 +770,7 @@ to resolve a merge after the trivial merge done with <em>git read-tree -m</em>.< <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-21 00:40:27 JST
+Last updated 2013-08-20 08:40:27 PDT
</div>
</div>
</body>
|