Re: splitting ChangeLogs

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Wed, 06 Apr 2011 12:53:21 -0400
> 
> > What conflicts? there are no conflicts (assuming you have the
> > changelog_merge plugin).
> 
> Well, in my view, the changelog_merge plugin resolves conflicts
> resulting from a merge more than it performs a merge, but I don't know
> if the implementation matches my mental image of it.

It doesn't.  changelog_merge completely replaces the default merge
method.  In fact, it falls back on the default method if its own
fails.