diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:40:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:40:39 -0700 |
| commit | 1b61cf8632a7ef3ee17701625cee277336d89162 (patch) | |
| tree | ef0b50fe7d3781f7254b5b0e7de6b03e0008a86a /git-merge-file.html | |
| parent | 387ce23faf999558814034627e2b19817cec39a0 (diff) | |
| download | git-htmldocs-1b61cf8632a7ef3ee17701625cee277336d89162.tar.gz | |
Autogenerated HTML docs for v2.14.0-rc0
Diffstat (limited to 'git-merge-file.html')
| -rw-r--r-- | git-merge-file.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-file.html b/git-merge-file.html index ecf7c8bac..a38e77f60 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -884,7 +884,7 @@ implements all of RCS <em>merge</em>'s functionality which is needed by <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-31 06:57:17 JST
+Last updated 2015-10-30 14:57:17 PDT
</div>
</div>
</body>
|