From: Glenn Morris <rgm@gnu.org>
To: Bill Wohler <wohler@newt.com>
Cc: emacs-devel@gnu.org
Subject: Re: MH-E patch to support nmh 1.5
Date: Tue, 30 Sep 2014 11:31:25 -0400 [thread overview]
Message-ID: <gsa95hdt0y.fsf@fencepost.gnu.org> (raw)
In-Reply-To: 87r3ytu18s.fsf@olgas.newt.com
Bill Wohler wrote:
> I merged the changes back into trunk.
I don't know what you did, but it was not a merge commit, and it did not
merge non mh-e changes that are in emacs-24 but not yet in trunk, even
though your commit message implied it did.
(I guess you just applied the same mh-e changes by hand to both branches.)
Probably best to leave merging 24->trunk alone if you're not sure how to
do it (the answer is to use bzrmerge.el).
prev parent reply other threads:[~2014-09-30 15:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 4:21 MH-E patch to support nmh 1.5 Mike Kupfer
2014-09-30 5:27 ` Bill Wohler
2014-09-30 15:31 ` 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=gsa95hdt0y.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=wohler@newt.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.