Supported by a growing list of GUI source control management apps
Works as a fully functional diff or merge tool Subversion, Git, Mercurial, Bazaar, and Perforce support With text merge, three-way merge, folder comparison, and the ability to ignore whitespace-only differences, Kaleidoscope integrates perfectly with the version-control systems you already use.