I landed here because I was looking for a way to merge in an external merge editor (KDIFF3), but started merging with eclipse. I was not satisfied with the answers above. So here is ho for configuring kdiff3 as a merge and diff editor for SVN in eclipse:
go to Windows β Preferences β Command β SVN β Diff Viewer Add a new configuration (add a button): Extension or image type: * - if you want to specify different types of associations for different editors, I did not need that, therefore, an alquator.
Diff: Program path C: \ Program Files \ KDiff3 \ kdiff3.exe (or wherever you have a merge editor - sry for the window path, feel free to add the linux version to the comments or edit this answer.)
Arguments: $ {base} $ {mine} $ {theirs}
Merge: path to the program C: \ Program Files \ KDiff3 \ kdiff3.exe
Arguments: $ {base} $ {mine} $ {theirs} -o $ {merged}
This will probably work for other merge editors, but with a different argument syntax (think let us know :)).
Use as usual (team-> edit conflict) to merge and compare-> foo to represent diff.
Greetings
fl0w
source share