Skip to content

Instantly share code, notes, and snippets.

@sarathsp06
Created September 26, 2014 10:08
Show Gist options
  • Save sarathsp06/f741f0008272496a7e86 to your computer and use it in GitHub Desktop.
Save sarathsp06/f741f0008272496a7e86 to your computer and use it in GitHub Desktop.
#!/bin/sh
# Configure your favorite diff program here.
DIFF="/usr/bin/vimdiff"
# Subversion provides the paths we need as the sixth and seventh
# parameters.
LEFT=${6}
RIGHT=${7}
# Call the diff command (change the following line to make sense for
# your merge program).
$DIFF $LEFT $RIGHT
# Return an errorcode of 0 if no differences were detected, 1 if some were.
# Any other errorcode will be treated as fatal.
@sarathsp06
Copy link
Author

Bash file to set as diff tool for svn difff

  • Line 4- set the path of diff tool like meld,vimdiff etc
  • set diff-cmd = /path/to/svn_diff_custom.sh in $HOME/.subversion/config
  • make sure /path/to/svn_diff_custom.sh is executrable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment