summaryrefslogtreecommitdiffstats
path: root/git-mergetool.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-13 15:04:15 -0700
committerJunio C Hamano <gitster@pobox.com>2018-06-13 15:04:15 -0700
commit49bcf742a2710071f132cc7efcad8c4f4d7f0984 (patch)
tree523adeab1fec16817b238038cd4bafa1fd5a1f08 /git-mergetool.html
parent573a89242677cb41d0fa7e6b7bcd15fb71fe00a0 (diff)
downloadgit-htmldocs-49bcf742a2710071f132cc7efcad8c4f4d7f0984.tar.gz
Autogenerated HTML docs for v2.18.0-rc2
Diffstat (limited to 'git-mergetool.html')
-rw-r--r--git-mergetool.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html
index b13897a9c..a5b0ee793 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -881,7 +881,7 @@ are successfully merged.</p></div>
<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>