Re: ChangeLog.4

[Eli Zaretskii]

> Date: Wed, 17 May 2023 14:25:17 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > From: Po Lu <luangruo@yahoo.com>
> > Date: Wed, 17 May 2023 16:39:08 +0800
> > 
> > Every change after:
> > 
> > 2022-04-04  Eli Zaretskii  <eliz@gnu.org>
> > 
> >     * Version 28.1 released.
> > 
> > appears to have been made on:
> > 
> > 2023-04-15  Eli Zaretskii  <eliz@gnu.org>
> > 2023-04-15  Po Lu  <luangruo@yahoo.com>
> > 
> > in ChangeLog.4.  Would someone please look into this?
> 
> Some kind of gitmerge snafu, it seems.

I figured out the reason: it's my fault.  I have in my ~/.gitconfig

  [merge "merge-changelog"]
      name = GNU-style ChangeLog merge driver
      driver = /usr/local/bin/git-merge-changelog %O %A %B

So this is the result of using git-merge-changelog, which is not TRT
when merging ChangeLog.4 from the release branch to master.

Sorry.