Custom merge tools

Greg Ward greg-bzr at gerg.ca
Thu Apr 2 14:55:03 BST 2009


Hi --

Is it possible for Bazaar to invoke a custom merge tool like kdiff3 or
meld?  I like that the default behaviour is to write out the three
"base/mine/other" files; that's much better than the traditional "run
merge and hope the user understands what <<<< and >>>> mean" approach.
 However, those three files are even better when used with a GUI
diff/merge tool.  Right now, after a conflict I have to run

  kdiff3 conflicting-file.{THIS,MINE,OTHER} -o conflicting-file

for each conflicting file.  Is there a way to automate this?  I
couldn't find anything in the user reference manual or the wiki.

Thanks --

Greg



More information about the bazaar mailing list