diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-26 15:13:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-26 15:13:53 -0800 |
| commit | 2ef0ba3d29e4b0c3a24887c2cf8d02ee62c852d1 (patch) | |
| tree | 7715b6a9fa73a434ea16c2006f137f9aee4d7640 /git-merge.html | |
| parent | 7b9cce9df833532347e272c1a4ad6b17f6564f7f (diff) | |
| download | git-htmldocs-2ef0ba3d29e4b0c3a24887c2cf8d02ee62c852d1.tar.gz | |
Autogenerated HTML docs for v2.16.1-72-g5be1f
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index 3f6ef52aa..963901af4 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1941,7 +1941,8 @@ branch.<name>.mergeOptions <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-11-09 22:00:41 PST
+Last updated
+ 2018-01-26 15:11:04 PST
</div>
</div>
</body>
|