Sublime Merge | Git client from the makers of Sublime Text

Sublime Merge is a Git GUI client from the makers of Sublime Text providing a fast reliable interface for viewing and managing Git repositories with advanced merge capabilities. The platform features powerful search tools for finding commits by message author files and changes with a custom query language. Sublime Merge includes reliable merge conflict resolution with a three-way diff view highlighting differences between base local and remote versions. Developers who appreciate Sublime Text editor often use Sublime Merge for its matching design aesthetic and performance.