summaryrefslogtreecommitdiffstats
path: root/git-mergetool.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-29 13:19:52 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-29 13:19:52 -0800
commitcf7310088e7328f8aa7ea2c5de767ef9499b5d78 (patch)
tree3f331489198d3d1af7c9948f12c477e4ba93ac71 /git-mergetool.html
parenta90214fb857c988a9e8dff46626dc715918a9330 (diff)
downloadgit-htmldocs-cf7310088e7328f8aa7ea2c5de767ef9499b5d78.tar.gz
Autogenerated HTML docs for v2.20.1-390-gb5101
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 98cc8ee7b..129452936 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -904,7 +904,7 @@ are successfully merged.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-30 16:33:48 JST
+ 2018-10-30 00:33:48 PDT
</div>
</div>
</body>