Re: bzr help, please

[Juanma Barranquero]

On Fri, Jul 1, 2011 at 09:06, Eli Zaretskii <address@hidden> wrote:

> Install the changelog_merge plugin
> (https://launchpad.net/bzr-changelog-merge), and you will never ever
> have merge conflicts in ChangeLog files.  This will be included in the
> next version 2.4 of bzr, but for now you will need to install it
> separately.

2.4b4 does not include changelog_merge. There's a news_merge, but it
seems specific for bazaar's NEWS file.

Or do you mean that the funcionality will be included without
requiring a plugin?

    Juanma