Created
September 26, 2014 10:08
-
-
Save sarathsp06/f741f0008272496a7e86 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/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. | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Bash file to set as diff tool for svn difff
diff-cmd = /path/to/svn_diff_custom.sh
in$HOME/.subversion/config
/path/to/svn_diff_custom.sh
is executrable