Re: Need review of emacs-25-merge branch

[Lars Magne Ingebrigtsen]

John Wiegley <address@hidden> writes:

>>>>>> Lars Magne Ingebrigtsen <address@hidden> writes:
>
>> Can you post the twelve merge conflicts? That would make it easier to see
>> whether the results are what we want...
>
> Sure, here is the entire set of conflicts I dealt with yesterday:

Thanks.  Looking over the conflicts and your resolutions, it looks to me
like you did the merges the right way.  :-)  I think.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no