[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: MH-E patch to support nmh 1.5
|
From: |
Glenn Morris |
|
Subject: |
Re: MH-E patch to support nmh 1.5 |
|
Date: |
Tue, 30 Sep 2014 11:31:25 -0400 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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).