Sublime Merge - Git client from the makers of Sublime Text
With the power of Sublime Text syntax highlighting, you can understand exactly what's been changed in a commit. With over 40 supported languages out of the box, and automatic loading of installed third-party syntaxes, we've got you covered.
https://www.sublimemerge.com/
