[Kde-extra-gear] KDiff3 subversion support as merge-tool-cmd

[Joachim Eibl]

Hi Ben,

It seems to me that this is not a svn configuration file, but rather an 
ICE-config file. This probably means that this is possibly ICE-specific.

For such a special case I'd rather not make this change in KDiff3. It's should 
be very easy to write a little script that is called instead and converts to 
KDiff3 calling convention.

eg.: "kdiff3caller"
#/bin/sh
kdiff3 $1 $2 $3 -o $4

Best regards,
Joachim

> Here is the link that has a config which specifies how the command is
> called:
>
> http://ice.usq.edu.au/svn/ice/downloads/latest/documentation/.ice/config
>
> Not sure why the documentation says this. How the command is called is kind
> of important. Not sure what to do for the ambiguity though. Leaving it as a
> three-file comparison would probably work best since it's then backwards
> compatible with any scripts one might have written. Maybe subversion should
> have in the config file options for each file to compare would be
> the "cleanest" solution.
>