Prism.app is a file comparison tool for macOS which uses the most excellent Prism syntax highlighter for tokenization instead of the normal line based splitting.
Prism.app also contains a cli tool which may be installed to make life in the terminal a bit easier.
prism -local local.txt -remote remote.txt
-
In the app click on Buildhead ▶ Install Command Line Tools…
-
In
.gitconfig
, add the following statement:[difftool "Prism"] cmd = /usr/local/bin/prism -local \"$LOCAL\" -remote \"$REMOTE\" -gui YES path =
The Prism app icon was made by Freepik from www.flaticon.com.
Other icons are from Font Awesome's free collection (with slight modifications to look good on the toolbar).