Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

David Engster <address@hidden> writes:

> Even if you have a conflict, the '-x' will already append "cherry picked
> from commit...", which we should probably just add to
> gitmerge-skip-regexp anyway.

Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is
without conflicts, and emacs-25 still builds.  :-)

I just wanted to triple-check before pushing: Is this the way to do it?

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