Kompare

DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file. Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different. Right-click on any two files in Windows Explorer to diff them immediately. Rulesets and options provide for customized appearance and behavior. Identical feature set on Windows, OS X, and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.

DirDiff started as a tool to check two copies of files in separate directories, either by date or by a different modified date. From there, we had a go at building our own text-diff. Other diff's show the content of both files, and thus show the content that is equal twice. Sounds like a lot of wasted screen-space, so we show a single 'flow' and the different parts in different colors. Yes, we know we might have got green and red reversed, but since we use diff primarily to check what we've changed before commit, We like them to show up in red because it draws attention. It can also show the structure of XML documents in a tree view. If you configure the usual attribute names that holds identifying values, it will use those to show the relevant changes. If you're using TortoiseSVN, it turns out to be a good alternative diff to use with TortoiseSVN, open the settings and enter the command provided in our site for the external Diff Viewer.