Today I Learned: collection of notes, tips and tricks and stuff I learn from day to day working with computers and technology as an open source contributor and product manager

View project on GitHub

Using OSX FileMerge as diff tool

You can with success specify the FileMerge application bundled with Xcode as diff tool on the command line, this does require that you use the command line wrapper tools specified on the FileMerge page.

TODO: clarify resources

% svn diff --diff-cmd fmdiff <some file>