[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Some proposed backports from master to emacs-25
|
From: |
Noam Postavsky |
|
Subject: |
Re: Some proposed backports from master to emacs-25 |
|
Date: |
Thu, 6 Oct 2016 21:42:01 -0400 |
On Tue, Oct 4, 2016 at 8:18 AM, Eli Zaretskii <address@hidden> wrote:
>> >> This is only on the master branch, though. I've no idea why I didn't
>> >> commit this to emacs-25...
>> >
>> > The merges are only done on master, right?
>>
>> Yeah, so it should be fine, except that it's potentially a bit
>> confusing (I asked the question because I only looked at the emacs-25
>> branch).
>
> I'm okay with backporting that change to emacs-25.
Merged the scratch/backports-25.2-strict branch in fb12af2, and
cherrypicked the gitmerge.el change as a6e0a677.
- Re: Some proposed backports from master to emacs-25, (continued)