hey aaron – i use the filemerge app that comes with xcode (i believe). didn’t realize it was included but found it with a little research. it should be in the /Developer/Applications/Utilities directory.