How to set kdiff3 as merge tool for SVN

svn merge conflict kdiff3
gruszczy picture gruszczy · Jan 26, 2011 · Viewed 22.3k times · Source

I would like to be able to resolve conflicts using kdiff3, when SVN notifies me about the conflict. How can I set it as a default tool for this?

Answer

Jon Ander Ortiz Durántez picture Jon Ander Ortiz Durántez · Jan 26, 2011

Go to the Subversion configuration file (/etc/subversion/config or ~/.subversion/config), and set merge-tool-cmd variable with your favourite tool:

### Set merge-tool-cmd to the command used to invoke your external
### merging tool of choice. Subversion will pass 4 arguments to
### the specified command: base theirs mine merged
# merge-tool-cmd = merge_command

Although there is a problem with kdiff3 which does not support four plain arguments (SVN passes four plain arguments to kdiff3, and it does not work), so it is usually called with a simple script to translate the arguments, e.g., "kdiff3caller":

#!/bin/sh
kdiff3 "$1" "$2" "$3" -o "$4"

This kdiff3 problem and solution is explained here.

Related questions

Subversion post-merge tree conflict - "local delete, incoming edit upon merge"

I did a merge between the trunk and a branch. On the trunk, there is a folder, let's say templates/Toto. On the branch, everything but the folder Toto is there (not a local delete, Toto is simply not in …

Read More
Why am I getting tree conflicts in Subversion?

I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the …

Read More
Merge a Branch into Trunk

I'm facing a peculiar problem with SVN merge. I want to merge from a dev branch to trunk. We have multiple dev branches cut off the trunk at the same time. I'm merging one of those branches to trunk with …

Read More