Versions Compared

Old Version 1

changes.mady.by.user Jon Gorrono

Saved on

compared with

New Version Current

changes.mady.by.user Jon Gorrono

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 5.3

...

Code Block
titleSide-by-Side diff

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
titleSide-by-Side diff with 300 char width


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.