[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: bzr help, please

From: Eli Zaretskii
Subject: Re: bzr help, please
Date: Fri, 01 Jul 2011 17:07:45 +0300

> From: Juanma Barranquero <address@hidden>
> Date: Fri, 1 Jul 2011 13:48:00 +0200
> Cc: Lars Magne Ingebrigtsen <address@hidden>, address@hidden
> 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.

Please report that to the bzr mailing list.  The URL above clearly


  The changelog_merge plugin is included in bzr 2.4. If you have an
  earlier version...

And I clearly remember a message posted to the bzr mailing list saying
that it "landed".

reply via email to

[Prev in Thread] Current Thread [Next in Thread]