
When working with code, especially with front end code, you might want to see a diff of two files. Maybe you have a build tool that's doing something with it or just two different versions. The point is: You want to know exactly if two files are the same or just have all the differences listed. I'll just share some of my favourite tools for that.



There are a bunch of great tools and GUI-wise, when my needs are either different or not satisfied by a simple <code>git diff</code>, I tend to use <a href="http://meldmerge.org/">Meld</a>, which is a cross platform and open source diff and merge tool. I mentioned it before, in my post on <a href="http://jonathanmh.com/how-to-create-a-git-merge-conflict/">how to create a git merge conflict</a>.

Another tool, which also is available for both Windows and Linux is <a href="http://diffuse.sourceforge.net/">Diffuse</a>, which sadly still is hosted on sourceforge, but should work just fine too.

A representative from the QT project corner would be <a href="http://kdiff3.sourceforge.net/">kdiff3</a> which can be downloaded for Mac, Linux and Windows as well.

If you're exclusively on Windows, you might want to give <a href="http://winmerge.org/?lang=en">WinMerge</a> a shot. May your god have mercy on your soul.

What do you use for diffs?

When working with code, especially with front end code, you might want to see a
diff of two files....

Show the diff(erence) between two files [free GUI client]