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

[David Engster]

Ted Zlatanov writes:
> On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii <address@hidden> wrote: 
>
> EZ> No need to fear, just remember to review what "git show" displays,
> EZ> after the merge and before you push.  If it doesn't look OK to you,
> EZ> you can always reset to cancel the merge.
>
> Yup.  I did it, carefully.

I'm afraid something went wrong. You did not actually merge.

Could it be that you somehow rebased before pushing (by doing 'pull
--rebase', for instance)?

-David