[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] emacs-25 f234cf2: Merge branch 'master' into emacs-25
|
From: |
John Wiegley |
|
Subject: |
Re: [Emacs-diffs] emacs-25 f234cf2: Merge branch 'master' into emacs-25 |
|
Date: |
Sat, 14 Nov 2015 10:20:32 -0800 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) |
>>>>> Dmitry Gutov <address@hidden> writes:
> Merge branch 'master' into emacs-25
Hi Dmitry,
Since we are beyond the freeze, we no longer wish to merge from master into
the release branch.
Further, master contained a change that I requested the author to revert
(Juri's change relating to multiple regions). So I definitely do not want this
in the release branch.
Therefore, I think we should revert this merge, and cherry-pick those commits
within it that are bug fixes against 25.1.
John
- Re: [Emacs-diffs] emacs-25 f234cf2: Merge branch 'master' into emacs-25,
John Wiegley <=