kdiff3 command under windows

[Nick Stolwijk <ni...@planet.nl>]

Has somebody used kdiff3 under windows with Subversion?

We tried to supply it through the --diff3-cmd parameter of subversion, 
but I guess the parameters are in the wrong order.

Does someone has a script file to use kdiff3 or recommend another diff3 
tool for windows.

Thanks in advance,

Nick Stolwijk

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: kdiff3 command under windows

[Kevin Grover <ke...@kevingrover.net>]

RE: kdiff3 command under windows

[Gavin Lambert <ga...@compacsort.com>]

Quoth Nick Stolwijk <ma...@planet.nl>:
> Has somebody used kdiff3 under windows with Subversion?
> 
> We tried to supply it through the --diff3-cmd parameter of subversion,
> but I guess the parameters are in the wrong order.

I use the following in TSVN (for the merge command; I don't use kdiff3
for diffs):

"C:\Program Files\KDiff3\kdiff3.exe" %base %mine %theirs -o %merged --L1
%bname --L2 %yname --L3 %tname

Not all of that is strictly required, but it's what I prefer :)

It's possible you may need additional quotes around each % parameter.
We don't use spaces in our filenames so we've never had trouble, but I'm
not sure if TSVN automatically inserts quotes or not.

I'm not sure what the command-line SVN equivalent of the above is, since
I usually don't do merges from the command line on Windows.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org