diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
commit | 06ce83b0f83d238e1676b4adb708f142ab2f9cab (patch) | |
tree | fd8a17fa9e44c0cd9998a5dd175c09acad027425 /git-merge.html | |
parent | 46fbbcbae6430ff14f0d5ef0e6e9fea90d4fe808 (diff) | |
download | git-htmldocs-06ce83b0f83d238e1676b4adb708f142ab2f9cab.tar.gz |
Autogenerated HTML docs for v2.19.1-1052-gd166e
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 75660d09b..ec2a3859b 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1988,7 +1988,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2018-08-03 08:01:08 JST
+ 2018-11-13 23:05:48 JST
</div>
</div>
</body>
|