Today I Learned: collection of notes, tips and tricks and stuff I learn from day to day working with computers and technology as a developer

View project on GitHub

Use filemerge from the command line

Useful commandline tools for FileMerge: http://www.defraine.net/~brunod/fmdiff/

% fmdiff <file1> <file2>

For use with Subversion:

% svn diff --diff-cmd fmdiff <fileunderversioncontrol>