SourceGear | DiffMerge

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. Windows Explorer Integration. Right-click on any two files in Windows Explorer to diff th

[hidehara]

お、このDiffツールいいかも。WinMergeに近しくて、必要最低限の機能はありそう。Win/Mac/Linuxのクロスプラットフォーム。最新版が2013年だけど、安定してるから？

[hideki_a]

無料で利用可能。使い勝手もまずまずらしい。

[drumsco]

Windows、Mac、Linuxで動作する diff tool.