Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30

[Po Lu]

Michael Albinus <michael.albinus@gmx.de> writes:

> Po Lu via Mailing list for Emacs changes <emacs-diffs@gnu.org> writes:
>
> Hi,
>
>> branch: master
>> commit 35606d575b8830174874b9ddcc24ed8243071f53
>> Merge: f54ad127eec 684e96a30d9
>> Author: Po Lu <luangruo@yahoo.com>
>> Commit: Po Lu <luangruo@yahoo.com>
>>
>>     ; Merge from savannah/emacs-30
>>
>>     The following commit was skipped:
>>
>>     684e96a30d9 Adapt tressitter tests on EMBA
>
> Is there a reason you have skipped this change? It is intended for both
> emacs-30 and master branches.

Escapes me.  I simply assented to choices proposed by admin/gitmerge.el.
The offending portion of the commit message is:

  Adapt tressitter tests on EMBA
  
  * test/infra/Makefile.in (TREE-SITTER-FILES): Simplify.
  
  * test/infra/test-jobs.yml: Regenerate.
                              ^^^^^^^^^^^

Which matches `gitmerge-skip-regexp'.