Using xxdiff with bazaar
I'm acclimating myself to bazaar, in anticipation of migrating all of my subversion repositories to it in the near future. One of the first things I desperately needed to do was get bazaar to use xxdiff for diff'ing and merging, since I
xxdiff so much. Turns out it was trivially easy -- much easier than the hoops I had to jump though to get svn to use xxdiff.
I just added the following to my $HOME/.bazaar/bazaar.conf file:
[ALIASES] diff = diff --using xxdiff
That fixed diff, and the following fixed merges:
[DEFAULT] external_merge = xxdiff
Aliasing is documented in the bazaar user's guide, but the external_merge option wasn't discovered until I did some googling. It looks like it started out as a plugin, but is now included natively in bazaar.