##Use FileMerge for SVN diffs/merges (via command line)
###Install bash scripts
Setup and bash scripts are from the writeup here: http://www.defraine.net/~brunod/fmdiff/
Checkout file merge utility scripts from here: http://soft.vub.ac.be/svn-gen/bdefrain/fmscripts/ or download archive here: http://www.defraine.net/~brunod/fmdiff/fmscripts-20120813.tar.gz
Move to the directory of the downloaded files and make
to allow the included makefile to locate the FileMerge app and then sudo make install
to install the scripts to your bin folder.