Is there any way to get svn to use an external merge tool, but only for conflicts?

In other words, if I set up an external merge tool like diffuse (http://diffuse.sourceforge.net/), when svn finds a conflict it just throws both repository and working copy files at the external merge tool. In that tool, you'll see every difference, not just the conflicts. What I'd like is to have svn merge everything it can, and then call the external merge tool. The only differences shown in that tool will be the conflicting sections. Sort of an external version of the 'dc' command.

Or is there some other way to do this?  I'm using svn 1.7.8.

Reply via email to