Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Ted Zlatanov]

On Sun, 14 Dec 2014 09:46:12 -0800 Paul Eggert <address@hidden> wrote: 

PE> (The particular problem Ted ran into seems pretty complicated; I'm
PE> not sure it's a good use case for us when designing our development
PE> workflow.)

No, please assume I screwed up :)

But I still think generally, cherry-picks are easier to manage and
harder to screw up.  The gitmerge.el workflow is basically a sequence of
cherry-picks.

Ted