I’ve been using WinMerge to see side-by-side diffs of text files and it works pretty well. But, having to use a separate program from my text editor, Sublime Text, is a bit inconvenient. While there are many diff plugins for Sublime Text, Sublimerge appears to be one of the best. I tested it out and it’s pretty easy to use with some nice syntax and diff highlighting. One thing I particularly like about it is the ability to show differences “within” a line in a very clear way. Lines containing differences are outlined whereas the actually text that is different is highlighted as shown in the screenshot below.