Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29

[Eli Zaretskii]

> From: Stephen Berman <stephen.berman@gmx.net>
> Cc: emacs-devel@gnu.org
> Date: Sat, 13 Jan 2024 18:12:28 +0100
> 
> On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
> 
> >> >     The following commit was skipped:
> >> >
> >> >     26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
> >>
> >> Because of this, the typo stills exists on master.  Is this due to my
> >> having mistakenly committed the change to master and then reverting it
> >> and committing it to emacs-29?
> >
> > I guess so, yes.
> 
> I wonder how this happened; I didn't mark the commit for skipping as per
> gitmerge.el.

I guess some subtle bug in gitmerge.el's algorithms.

> >> Does it now have to be manually installed to master as well?
> >
> > Yes, please.
> 
> Done.

Thanks.