bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits

[Eli Zaretskii]

> Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org
> Date: Sat, 10 Dec 2022 09:52:14 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> 
> > 508b0c1b223 | * | Fix crash on Windows 9X
> > 670daa8b626 | * | Add recursion limit to 
> > treesit--children-covering-range-recurse
> > b429e524288 | * | Improve tree-sitter fontification in edge-cases 
> > (bug#59738)
> > c83c95634e7 | * | Add c-ts-mode-indent-defun (bug#59662)
> > 6479691cf07 | * | Fix syntax-table for tree-sitter modes
> > b710ca62c00 | * | c++-ts-mode: Highlight nullptr as a constant
> > d31a2539834 | * | Improve parameter checking in tree-sitter 
> > functions
> > a669d5fae54 | * | ; * test/lisp/comint-tests.el 
> > (w32-application-type): Fix typo.
> > f7262b8f81e | * | Fix comint-tests on MS-Windows
> > fef17557365 | * | Use new external-completion.el in Eglot
> > bf81df86e52 | * | Don't override completion-category-defaults in 
> > fido-mode
> > 4bc9c8972ac | * | Add lisp/external-completion.el for completions 
> > from external tools
> > bfc00f1c120 | * | Eglot: fix setting of 
> > flymake-list-only-diagnostics (bug#59824)
> > d2411615e8b | * | * test/src/sqlite-tests.el (sqlite-version): 
> > Declare.
> 
> You are saying that all of the above commits don't have their changes
> in master?

I've went over all of the above commits, and manually committed
changes of those of them which appeared to be missing from the master
branch.

I have no idea how this happened.  I guess we have some subtle bug in
gitmerge.el, perhaps triggered by the situations like the one at that
merge, where a feature branch which was not forked from our Git
repository was merged piecemeal into the release branch.