summaryrefslogtreecommitdiffstats
path: root/git-mergetool.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-20 15:46:08 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-20 15:46:08 -0700
commitde44de3d9e71db785a0bbd06a6ddad8d2c38dd67 (patch)
tree6ded4cd8380b37ba1b9144d972bf0a6217de78aa /git-mergetool.html
parentc6d56e8fea997f642ab3ba5e420139151d198f55 (diff)
downloadgit-htmldocs-de44de3d9e71db785a0bbd06a6ddad8d2c38dd67.tar.gz
Autogenerated HTML docs for v2.33.0-514-g99c99
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 bcb571579..4000bd417 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -1047,7 +1047,7 @@ are successfully merged.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-03-17 15:50:25 PDT
+ 2021-03-18 23:59:50 PDT
</div>
</div>
</body>