Skip to content

Instantly share code, notes, and snippets.

@dreikanter

dreikanter/README.md

Last active August 29, 2015 14:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dreikanter/666934217c1520733435 to your computer and use it in GitHub Desktop.
Save dreikanter/666934217c1520733435 to your computer and use it in GitHub Desktop.
Download ZIP
Setting up Beyound Compare 4 as diff/merge tool for SVN console client on OS X
Raw
README.md

Beyond Compare 4 ❤️ SVN @ OS X

Put this to /usr/local/bin/bcdiff:

/usr/local/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -readonly
exit 0

Put his to /usr/local/bin/bcmerge:

/usr/local/bin/bcompare "$2" "$3" "$1" "$4"

Do this:

chmod +x /usr/local/bin/bc{diff,merge}

Update SVN config at ~/.subversion/config:

diff-cmd = /usr/local/bin/bcdiff
merge-tool-cmd = /usr/local/bin/bcmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment