Merge algorithms

[Eli Zaretskii]

> Date: Sat, 06 Nov 2010 11:11:16 +0200
> From: Eli Zaretskii <eliz at gnu.org>
> 
> Thanks again for this nice feature.  Given enough testing and positive
> feedback from others, I would suggest to make it part of bzrtools.

A question about this plugin: will it be used when I "bzr update" in a
bound branch?  If so, perhaps it would be a good idea to define an
alias for "update" to use --no-plugins, because ChangeLog files
updated from upstream can be expected to have modifications in
existing entries, which this plugin ignores.  WDYT?