I use the svndiffwrapper[1] script to use SVN cli in combination with
kdiff3. Save the script to ~/bin/ and make it executable. (And make
sure ~/bin is on the path) Then change ~/.subversion/config to include
the lines:
# diff3-has-program-arg = [true | false]
diff-cmd = svndiffwrapper
diff3-cmd
to get them in the right order for a 3 way diff. I recall
having to explicitly set the merge output file but that may be because I
messed with the order of files.
I also use kdiff3 from Kate as an external tool and bound to shift+F12 so I
can diff the current file in a quick and easy way
it but I
would like some advice on how to call it. I know it can take two
or three files, but I'm not sure why (i.e. what's the difference)
and which files to feed it with and in what order.
I use KDiff3 to resolve conflicts in conjunction with the
command-line svn client on Windows (it works really
