From: phillip.lord@russet.org.uk (Phillip Lord)
To: Michael Albinus <michael.albinus@gmx.de>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] emacs-25 f5c762c: Additional changes for "make check-expensive"
Date: Thu, 14 Jan 2016 22:15:36 +0000 [thread overview]
Message-ID: <8760yvyfhz.fsf@russet.org.uk> (raw)
In-Reply-To: <87pox6wrtb.fsf@gmx.de> (Michael Albinus's message of "Tue, 12 Jan 2016 19:55:44 +0100")
Michael Albinus <michael.albinus@gmx.de> writes:
> John Wiegley <jwiegley@gmail.com> writes:
>
>> Hi Phillip, we need to get all of this straightened out, let me know so that I
>> can reflect the same changes into master, in order to repair what was lost of
>> this work during yesterdays' merge.
>
> I believe Philip is not speaking about a problem of the merge from
> yesterday. It's about my original commit to the emacs-25 branch.
Yep, no worries about the merge. Michael's change went in a while back.
Phil
next prev parent reply other threads:[~2016-01-14 22:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160105084751.30334.99051@vcs.savannah.gnu.org>
[not found] ` <E1aGNHT-0007u5-Su@vcs.savannah.gnu.org>
2016-01-12 17:43 ` [Emacs-diffs] emacs-25 f5c762c: Additional changes for "make check-expensive" Phillip Lord
2016-01-12 17:49 ` John Wiegley
2016-01-12 18:55 ` Michael Albinus
2016-01-14 22:15 ` Phillip Lord [this message]
2016-01-12 19:03 ` Michael Albinus
2016-01-14 8:13 ` Michael Albinus
2016-01-14 23:04 ` Phillip Lord
2016-01-15 8:45 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8760yvyfhz.fsf@russet.org.uk \
--to=phillip.lord@russet.org.uk \
--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 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.