Re: changelog-merge plugin and edited ChangeLog entries

[Miles Bader]

Stefan Monnier <address@hidden> writes:
>> The gnulib "git-merge-changelog" merge program[*] is reported to
>> handle this case correctly, and supposedly can be used with either git
>> or bzr (or hg).
>
> I haven't had too many problems related to this with change-log-mode's
> change-log-resolve-conflict either.

The nice thing about git-merge-changelog though is that it will handle
automatically for bulk merges (though apparently not for bzr), without
the user needing to get involved at all.

-Miles

-- 
XML is like violence.  If it doesn't solve your problem, you're not
using enough of it.