Document Actions

Using kdiff3 with bazaar

by David Hostetler [posted 20110201:17:03 (Tue)]

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