Log

This is part 2 of my !epic 3-part series of how to use kdiff3 when something else wants to launch a graphical diff tool.

This part is even more pathetically non-epic than part one because it's basically just a rehash of a previous post on how to use xxdiff with bazaar.

But no matter, it's worth doing just to get the right words into the site's search index.

As demonstrated previously, it's trivially easy to get bazaar to use the graphical diff tool of your choice, assuming the tool has reasonable support for command-line arguments.  I discovered that Meld does not, which is why I'm now using kdiff3.

Anyway, just add the following to your $HOME/.bazaar/bazaar.conf file:

[ALIASES]
diff = diff --using kdiff3

That fixed diff, and the following fixed merges:

[DEFAULT]
external_merge = kdiff3

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.