Re: merging emacs-24

[Ted Zlatanov]

On Wed, 26 Nov 2014 20:02:22 +0100 David Engster <address@hidden> wrote: 

DE> Stefan Monnier writes:

>> You might prefer to wait for the gitmerge.el  to appear (I thought it
>> was supposed to be done already, but I guess it's taking a bit more
>> time than expected).

DE> Seems like you overlooked this:

DE> http://article.gmane.org/gmane.emacs.devel/178096

I'm probably not the right person to test this, having done no merges
before.  I'll do this one manually.

Ted