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

[Ted Zlatanov]

On Sat, 13 Dec 2014 10:50:13 +0100 David Engster <address@hidden> wrote: 

DE> David Engster writes:
>> 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)?

I don't think so? Now I'm just perplexed, too. I must have rebased the
commit accidentally. I *started* to rebase because a commit came in
before I pushed.  But I aborted the rebase, then redid the merge.

DE> Hmm. Even that wouldn't explain it, since I cannot see any rebased
DE> commits from 'emacs-24' on 'master'. It seems like they're all squashed
DE> into this one commit. I'd really like to see your reflog.

DE> Anyway, I guess the best way to fix this is to do another merge of
DE> emacs-24 with merge strategy 'ours'?

It's definitely pilot error, you can assume it's not gitmerge.el.
Andreas has redone the merge, it seems.

I'm sorry about this, I'll get it right next time.

Ted