Re: Freeze is almost here

[David Engster]

David Engster writes:
> I see now that master was merged into emacs-25. Is this now the new
> workflow? If so, there's not much point in keeping gitmerge.el anyway.

Sorry, forget what I said. I forgot the we don't freeze master anymore,
so I guess this was a one-time merge just to forward emacs-25. I was
just confused because git couldn't detect the cherry-picks, but this is
because of this merge from master.

-David