Re: changelog-merge plugin and edited ChangeLog entries

[Eli Zaretskii]

> From: Miles Bader <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden
> Date: Sun, 27 Feb 2011 07:52:06 +0900
> 
> 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.

Yea, yea, and git is better than bzr, and we should destroy
Carthage...