You can pipe DIFF to TextMate DIFF is a compare tool that you can use from the Terminal to compare files. What I did not know though is that you can PIPE the results to Textmatediff /path/to/project/index.cfm /path/to/project/index.cfm | mate