...
Code Block | ||
---|---|---|
| ||
svn --diff-cmd "diff" --extensions "-y" diff |
*NOTE: the --extensions switch can only be used if the --diff-cmd is also used.
It might be helpful to increase the width of the line for the commandline diff (GNU diff defaults to 130 chars):
Code Block | ||
---|---|---|
| ||
svn --diff-cmd "diff" --extensions "-y --width=300" diff
|
--diff3-cmd
By using the diff3-cmd switch, you can tell subversion what shell command to use for merging. This could be a good place to make some groovy (or rather groovy groovy) script hooks into the merge process.