Merge algorithms

[Eli Zaretskii]

> Date: Mon, 20 Sep 2010 13:31:53 +1000
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: mbp at canonical.com, bazaar at lists.canonical.com
> 
> > I *might* look doing this myself next week if no-one has done it first,
> > and I haven't forgotten over the weekend...
> 
> I didn't forget :)

Thanks!

> Quick start guide:
> 
>     bzr branch lp:bzr-changelog-merge ~/.bazaar/plugins/changelog_merge
>     
>     bzr help changelog_merge

Looks promising, I will try this soon on several of my merges.