From: Po Lu <luangruo@yahoo.com>
To: Michael Albinus <michael.albinus@gmx.de>
Cc: emacs-devel@gnu.org
Subject: Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30
Date: Tue, 16 Jul 2024 16:14:30 +0800 [thread overview]
Message-ID: <874j8pzrbt.fsf@yahoo.com> (raw)
In-Reply-To: <87cyndyd1j.fsf@gmx.de> (Michael Albinus's message of "Tue, 16 Jul 2024 10:08:24 +0200")
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'.
next prev parent reply other threads:[~2024-07-16 8:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <172109631090.17973.7449765348063658289@vcs2.savannah.gnu.org>
[not found] ` <20240716021832.68243C2BC71@vcs2.savannah.gnu.org>
2024-07-16 8:08 ` master 35606d575b8 2/4: ; Merge from savannah/emacs-30 Michael Albinus
2024-07-16 8:14 ` Po Lu [this message]
2024-07-16 8:21 ` Michael Albinus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874j8pzrbt.fsf@yahoo.com \
--to=luangruo@yahoo.com \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).