[Emacs-diffs] master updated (1d9d35a -> 5498acb)

[Noam Postavsky]

npostavs pushed a change to branch master.

      from  1d9d35a   Merge from origin/emacs-26
       new  97d5d1a   Move tls.el and starttls.el to lisp/obsolete/ (Bug#31457)
       new  91ebbbf   Default to splash on current frame, if none visible 
(Bug#31169)
       new  5498acb   Stop assuming .git is a directory in gitmerge.el


Summary of changes:
 admin/gitmerge.el                  |  8 ++++++--
 etc/NEWS                           |  4 ++++
 lisp/gnus/nnimap.el                |  1 -
 lisp/net/network-stream.el         | 22 ++++++++++++++++++----
 lisp/net/sieve-manage.el           |  1 -
 lisp/{net => obsolete}/starttls.el |  0
 lisp/{net => obsolete}/tls.el      |  0
 lisp/startup.el                    |  3 ++-
 lisp/url/url-http.el               |  1 -
 9 files changed, 30 insertions(+), 10 deletions(-)
 rename lisp/{net => obsolete}/starttls.el (100%)
 rename lisp/{net => obsolete}/tls.el (100%)