all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Michael Albinus <michael.albinus@gmx.de>
To: Po Lu <luangruo@yahoo.com>
Cc: emacs-devel@gnu.org
Subject: Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30
Date: Tue, 16 Jul 2024 10:21:11 +0200	[thread overview]
Message-ID: <878qy1ycg8.fsf@gmx.de> (raw)
In-Reply-To: <874j8pzrbt.fsf@yahoo.com> (Po Lu's message of "Tue, 16 Jul 2024 16:14:30 +0800")

Po Lu <luangruo@yahoo.com> writes:

Hi,

>> 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'.

I see. I'll take a note *not* to use this buzzword in the future.

Best regards, Michael.



      reply	other threads:[~2024-07-16  8:21 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
2024-07-16  8:21       ` Michael Albinus [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878qy1ycg8.fsf@gmx.de \
    --to=michael.albinus@gmx.de \
    --cc=emacs-devel@gnu.org \
    --cc=luangruo@yahoo.com \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.