I suppose you could write a wrapper diff3 tool that invokes either /usr/bin/diff3 or your diff3 tool depending on the files it's invoked for?
Not saying it's ideal, but it'll work today (not when 1.7 is released). Sébastien Paumier wrote on Mon, Mar 14, 2011 at 12:59:23 +0100: > Hello, > I have to deal with a special file format representing a graph. To > do that, I have to write my own diff and diff3, but I did not figure > out how to invoke my own programs only for my special file type, > since those files are mixed with other file types on the svn server. > Is there a way to adjust the values given to --diff-cmd and > --diff3-cmd in the [auto-props] section of the config file on the > basis of the file extension ? If not, would it be possible to > consider a special return value from external diff and diff3 that > would mean "this job was not for me, use the default tool" ? > > Best regards, > Sébastien Paumier
