diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:46:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:46:08 -0700 |
commit | de44de3d9e71db785a0bbd06a6ddad8d2c38dd67 (patch) | |
tree | 6ded4cd8380b37ba1b9144d972bf0a6217de78aa /git-merge.html | |
parent | c6d56e8fea997f642ab3ba5e420139151d198f55 (diff) | |
download | git-htmldocs-de44de3d9e71db785a0bbd06a6ddad8d2c38dd67.tar.gz |
Autogenerated HTML docs for v2.33.0-514-g99c99
Diffstat (limited to 'git-merge.html')
-rw-r--r-- | git-merge.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index 4cb631b88..68acd05ec 100644 --- a/git-merge.html +++ b/git-merge.html @@ -2177,7 +2177,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2021-08-30 16:49:46 PDT
+ 2021-09-01 16:44:20 PDT
</div>
</div>
</body>
|