From: Glenn Morris <rgm@gnu.org>
To: "Jan Djärv" <jan.h.d@swipnet.se>
Cc: Adrian Robert <adrian.b.robert@gmail.com>,
"emacs-devel@gnu.org Development" <emacs-devel@gnu.org>
Subject: Re: NS compile error after trunk merge r118324
Date: Mon, 10 Nov 2014 02:40:59 -0500 [thread overview]
Message-ID: <ggh9y7v6yc.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <30A0C539-0202-4488-932A-A7DCB7FF9868@swipnet.se> ("Jan Djärv"'s message of "Mon, 10 Nov 2014 07:17:42 +0100")
BTw, if you (anyone) knows there is going to be a non-trivial merge
conflict, you can mark the emacs-24 change "do not merge to trunk" and
apply it by hand yourself to trunk.
prev parent reply other threads:[~2014-11-10 7:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-09 6:12 NS compile error after trunk merge r118324 Adrian Robert
2014-11-09 10:36 ` Jan D.
2014-11-09 19:40 ` Glenn Morris
2014-11-09 21:25 ` Jan D.
2014-11-09 22:57 ` Glenn Morris
2014-11-10 6:17 ` Jan Djärv
2014-11-10 7:40 ` Glenn Morris [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=ggh9y7v6yc.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=adrian.b.robert@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=jan.h.d@swipnet.se \
/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.