Sublime Merge includes powerful features like an integrated git merge tool, the ability to search for specific commits, command line integration, code and file history, and syntax highlighting.

GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a ...