I often find myself needing to diff directories of files. I've tried using FileMerge, but it is horribly broken for my application because often these files I need to diff have different line endings, ...

I want to use something like WinMerge on my Mac. It seems that all the functional equivalents (Meld, etc.) that don’t involve installing 14GB of XCode to get FileMerge are ten years old and provide ...

Code Compare is a free tool designed to compare and merge differing files and folders. Ite integrates with all popular source control systems: TFS, SVN, Git, Mercurial, and Perforce. Code Compare is ...

The tool is free, open source and easily available. You can download it as an executable – or fork the entire source code so that you can incorporate it into your ...

Even if you’ve installed Xcode, you may not use it much unless you create software for a living. But it’s worth exploring the Developer folder, as it holds some very useful tools. Consider FileMerge, ...

Sublime HQ – the folks behind the excellent text editor Sublime Text – has released a code editor for developers that focuses on a clean interface for coding and solving git merges. It’s called ...