Re: Need review of emacs-25-merge branch

[Lars Magne Ingebrigtsen]

John Wiegley <address@hidden> writes:

> I was presented with the same 12 merge conflicts; it took all of 1 second to
> perform that merge; and I would have had to resolve the same conflicts in the
> same way I did when using git-imerge. Only, it would have proceeded in a
> fraction of the time.

:-)

Can you post the twelve merge conflicts?  That would make it easier to
see whether the results are what we want...

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