[Top][All Lists]

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

Re: Need review of emacs-25-merge branch

From: Lars Magne Ingebrigtsen
Subject: Re: Need review of emacs-25-merge branch
Date: Sat, 02 Jan 2016 04:32:39 +0100
User-agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux)

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

reply via email to

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