Merge algorithms

[Eli Zaretskii]

> Date: Thu, 23 Sep 2010 10:20:30 +1000
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: bazaar at lists.canonical.com
> 
> IIRC, the filename is relative to the root of the tree, so "ChangeLog" will not
> match "src/ChangeLog".  If you need a more flexible policy let me know and I'll
> figure out how to adjust the plugin.

I would like ChangeLog files to in any subdirectory of the root to use
this plugin.

Thanks for the useful explanations.