On 19 February 2010 19:12, John Arbash Meinel <john at arbash-meinel.com> wrote: [snip] > With bzr 2.1.0+ you can create a per-file merge plugin, that checks for > any file ending in .axf and just always selects OTHER. This works like a charm, thanks for the suggestion. Al