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

[Glenn Morris]

Michael Albinus wrote:

> I took your word that merging with gitmerge.el is pretty easy. It
> started well. During the merge, I was asked whether I want to apply the
> changes of NEWS to NEWS.26 in master. I confirmed.

Oh dear. Sorry, it was my fault.

I've successfully got gitmerge to send the changes from emacs-26
etc/NEWS to master etc/NEWS.26, but I'm missing a step in gitmerge that
would do the equivalent of running M-x gitmerge again after having
manually resolved the NEWS conflict. I don't see how to fix this right
now. <Looks around hopefully for gitmerge authors...>

This lack of proper rename tracking is so annoying that I'm tempted to
suggest etc/NEWS always be called etc/NEWS.MAJORVERSION right from the
start, with etc/NEWS perhaps being just a symlink. (Cue complaints about
platforms lacking symlinks.)