export SVN_MERGE=/path/to/the/script/below/mergewrap.sh
#!/bin/sh
# mergewrap.sh
kdiff3 $1 $2 $3 -o $4
Now let's merge something and wait until SVN client detects a conflict and asks you what to do - then choose "l" for "launch external tool to resolve conflict":
svn merge -c17218 ^/src/trunk
--- Merging r17218 into 'backend':
U backend/src/main/resources/default.properties
Conflict discovered in 'backend/pom.xml'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: l
When you are done with the merge, have saved the file and closed kdiff3, you are asked the same question again. Now you can answer "r" for "accept merged version of file". That's it.
They say you can also set merge-tool-cmd configuration property, but somehow it did not work for me. SVN_MERGE did.