External diff/merge tools
Philippe Lhoste
PhiLho at GMX.net
Sun Apr 11 09:50:38 BST 2010
On 09/04/2010 22:15, Gaetano wrote:
> I'm trying to configure bazaar to use an external diff/merge tool: KDiff3.
> I have been reading tutorials and examples and it seems that all I need to
> do is
> - install KDiff3
> - add it to the path
> - modify bazaar.config adding the alias:
> [ALIASES]
> kdiff = diff --using c:/kdiff3/kdiff3.exe
I had a similar issue when I started with Bazaar. My tool of choice is
WinMerge. I haven't it on the path...
After much experimentations, somebody put me on the track, and now I use
the command:
[ALIASES]
wdiff = 'diff --using "C:/Program Files/_Text/WinMerge/WinMergeU.exe"'
Note the single quotes around the whole command!
I (no longer) use difftools and extmerge is another thing.
For the record, I use for the latter:
external_merge = C:/Program Files/_Text/Perforce Merge/p4merge.exe %b %o
%t %r
--
Philippe Lhoste
-- (near) Paris -- France
-- http://Phi.Lho.free.fr
-- -- -- -- -- -- -- -- -- -- -- -- -- --
More information about the bazaar
mailing list