Created
January 26, 2015 08:40
-
-
Save lovelock/d90535af2357407d809e to your computer and use it in GitHub Desktop.
svn-diff advanced configuration
This file contains hidden or 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
# This is the configuration of Wang Qingchun, who uses local Vim7.4 | |
# instead of the system wide Vim 7.0 | |
DIFF="$HOME/.local/bin/vimdiff +colo\molokai" | |
# 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment