The makers of Sublime Text have launched a dedicated plug-in for the version control software Git. Called Sublime Merge, it's a Git client that seamlessly integrates with the Sublime text editor, with a particular focus on the unenviable task of merging conflicting code.

The merge tool lets you resolve conflicts by comparing code across three panes:

  1. the left pane shows your changes
  2. the right shows their changes
  3. and the centre pane is the resolved code

Alongside this nifty merge interface, we get a powerful search tool, keyboard shortcuts, command line integration and syntax highlighting. Try for free, then it costs $99 if you decide to support the producers.