Re: merging emacs-24

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> From: David Engster <address@hidden>
>> Date: Thu, 27 Nov 2014 18:27:48 +0100
>> Cc: Ted Zlatanov <address@hidden>, address@hidden
>> 
>> Stefan Monnier writes:
>> >> Seems like you overlooked this:
>> >> http://article.gmane.org/gmane.emacs.devel/178096
>> >
>> > Indeed, I missed it.  Please install it into admin/gitmerge.el,
>> 
>> Done.
>
> Thanks, but why on master and not on emacs-24?

Why emacs-24?  It's not installed, so you need to load it manually
anyway.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."