Links
ExtMerge is bzr plugin to call an external merge helper tool to resolve conflicts.

This plugin calls a user defined tool, if that exists. Otherwise, it tries kdiff3, xxdiff and opendiff in that order.

This plugin has been tested under Linux and Mac.

To install it, you can run the following commands
mkdir -p ~/.bazaar/plugins
cd ~/.bazaar/plugins
bzr branch lp:bzr-extmerge extmerge

To use it, after a conflict, run:
bzr extmerge filename or
bzr extmerge --all

You can also download it from this zip file if you don't want to branch the branch.

Here is a screenshot of this on a Mac using opendiff. (click for larger picture)

[Image of extmerge]