Re: master e714b31 3/6: Merge from origin/emacs-28

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Wed, 10 Nov 2021 09:49:42 -0800
> Cc: emacs-devel@gnu.org
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > There was sufficient resistance to using a versioned name,
> 
> What resistance?  I see only overwhelming support based on this thread
> and e.g. these:
> 
> https://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html
> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29366

I guess we read different discussions, then.

> > so we should stick to what we have as long as it works well enough.
> 
> I think we have proof that it doesn't.

How can a simple bug in gitmerge be a proof of anything (except that
bugs happen)?