[Top][All Lists]

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

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Do

From: Lars Ingebrigtsen
Subject: Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)
Date: Sun, 01 May 2016 19:47:03 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)

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

reply via email to

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