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

[David Engster]

David Engster writes:
> Eli Zaretskii writes:
>> 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.
>
> I was hoping that gitmerge already does it, since I lifted the ChangeLog
> merge stuff directly from bzrmerge, which AFAIK also did the date
> fixes. I'll take a look why that doesn't work anymore.

It seems that this code will only fix dates for conflicted ChangeLog
files. However, the changelog merge driver will avoid those conflicts,
so nothing happens (Bzr had a changelog driver as well, so I'm not sure
how it ever worked).

I think the dates might get fixed when you disable the changelog merge
driver before running gitmerge.el. I know this is not really a solution,
but this is not trivial to fix and we'll switch to generated ChangeLogs
anyway, so I'm not inclined to work on this.

-David