Comment by nikeee

I use delta as a diff tool:

https://github.com/dandavison/delta

It also offers contextual information as well as side-by-side diffs. For syntax highlighting, it uses the same as bat (the cat clone).