Here's a quick tip. If you want to open FileMerge (Apples graphical diff utility
available in developer tools) from the CLI you can use the command opendiff e.g:
opendiff file1 file2 This save lots of hassle when you are trying to resolve
versioning conflicts, as I always