-

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
index 56f0ec35ba912522cdb102f04a74516345656204,e9b539a3785bce6f471b2b371acf979fc9db6d64..9fbe6955c8281852c87f86091785b195fa4aec60
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -225,17 -168,6 +227,11 @@@ the variable `dir-locals-file' for mor
  added via the new Network Security Manager (NSM) and controlled via
  the `network-security-level' variable.
  
- ** If Emacs isn't built with TLS support, an external TLS-capable
- program is used instead.  This program used to be run in --insecure
- mode by default, but has now changed to be secure instead, and will
- fail if you try to connect to non-verifiable hosts.  This is
- controlled by the `tls-program' variable.
- 
 +---
 +** International domain names (IDNA) are now encoded via the new
 +puny.el library, so that one can visit web sites like
 +"http://méxico.icom.museum".
 +
  +++
  ** C-h l now also lists the commands that were run.
  

diff --cc lisp/dired-aux.el
Simple merge

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/net/shr.el
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc test/manual/etags/CTAGS.good
Simple merge

diff --cc test/manual/etags/ETAGS.good_1
Simple merge

diff --cc test/manual/etags/ETAGS.good_2
Simple merge

diff --cc test/manual/etags/ETAGS.good_3
Simple merge

diff --cc test/manual/etags/ETAGS.good_4
Simple merge

diff --cc test/manual/etags/ETAGS.good_5
Simple merge

diff --cc test/manual/etags/ETAGS.good_6
Simple merge

diff --cc test/manual/etags/ruby-src/test.rb
Simple merge