Re: master 01db800: Merge from origin/emacs-26

[Eli Zaretskii]

> From: Glenn Morris <address@hidden>
> Cc: address@hidden,  address@hidden
> Date: Mon, 11 Dec 2017 14:14:53 -0500
> 
> Eli Zaretskii wrote:
> 
> > Instead of a symlink, we could rename it to NEWS as part of tarring
> > the release, I think.
> 
> That would leave NEWS non-existing in uninstalled builds.
> I think this would be a real PITA when developing.

Then perhaps building Emacs could symlink NEWS where symlinks are
supported and copy it where it isn't.

> The gitmerge thing is fixable, I think.

If it is, that's better.