You could use Apple’s FileMerge tool, or Kaleidoscope. Both of these have command-line invocations:
- to open FileMerge, install the command-line developer tools from inside Xcode and use
opendiff - to open Kaleidoscope, install its command-line tools from inside Kaleidoscope and use
ksdiff