- Kaleidoscope
- Can't manually edit files in software as merging
- FileMerge
- Free
- Directory diff is strange view
- Can't edit files in software as merging
- DiffMerge
- Free
- Directory diff is flat
- Strangely, can only edit the right side of the diff file
- P4Merge
- Free
- Can't diff directories
- Araxis Merge
- Comparing directories, adding new file to other side would prompt for a filename. Why not just retain the filename?!
- Beyond Compare
- This is more like it! Interface is a little ugly but whatever.
- Delta Walker
- WINNER!