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

[Eli Zaretskii]

> From: Ted Zlatanov <address@hidden>
> Date: Fri, 12 Dec 2014 19:25:38 -0500
> 
> 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.

Thanks.  I fixed the dates of the ChangeLog entries merged by that.

David, is it possible to enhance gitmerge.el to take care of that
automatically?  Otherwise I predict that people will keep making these
mistakes forever.

Thanks.