Skip to content

Instantly share code, notes, and snippets.

@cemckinley
cemckinley / svn-filemerge.md
Last active February 17, 2025 15:04
Set up SVN to use Filemerge as a diff/merge tool

##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.

@saetia
saetia / gist:1623487
Last active April 20, 2025 23:05
Clean Install – OS X 10.11 El Capitan

OS X Preferences


most of these require logout/restart to take effect

# Enable character repeat on keydown
defaults write -g ApplePressAndHoldEnabled -bool false

# Set a shorter Delay until key repeat