Find file
Fetching contributors…
Cannot retrieve contributors at this time
executable file 24 lines (18 sloc) 509 Bytes
#!/bin/bash
# Configure your favorite diff program here.
DIFF="vimdiff"
if [ -z $2 ]
then
echo ERROR: This script expects to be called by subversion
exit 1
fi
# 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.
exit 0