[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merging emacs-24

From: Ted Zlatanov
Subject: Re: merging emacs-24
Date: Wed, 26 Nov 2014 20:54:50 -0500
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux)

On Wed, 26 Nov 2014 13:59:33 -0500 Stefan Monnier <address@hidden> wrote: 

>> Is it enough to merge laconically like you did:
SM> [...]
>> ...and resolve conflicts as needed?

SM> Yes.  Be careful with the conflicts, tho: some of those patches should
SM> simply not be applied (regardless if they'd create conflicts or not).

OK, I pushed my proposed merge to the repo in branch
master-merge-emacs-24-2014-11-26 for your review.

The major change I'm not sure about is from Oscar Fuentes,
courtesy-CC-ed here. I'd appreciate a review for the MinGW64 stuff which
I don't understand enough to merge properly. The rest seems OK.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]