Sublime Merge is designed to work hand in hand with the command line. Key bindings, menus, theming, and the command palette are all customizable with simple JSON files. Just like Sublime Text, just about everything in Sublime Merge is extensible.

The Command Palette is triggered by Ctrl+P and allows quick access to a large set of Git commands as well as other Sublime Merge functionality. When writing a commit message, use Ctrl+Enter to commit. Use Tab to navigate through parts of the application, Space to toggle expansion, and Enter to stage/unstage hunks. This includes when you rename or move a file, when youвЂ™re resolving conflicts or just viewing commit history. Where it makes sense we will show you exactly which individual characters have been changed for a commit. With a powerful, cross-platform UI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance. Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. The same text editing functionality as Sublime Text is also available for more complicated merges.Д¬licking on the header in the middle pane will switch between the editable merge results and the base file. In the center pane is the resolved text, with buttons to choose between your changes or theirs.

On the left are your changes and on the right are theirs.

The Integrated Merge Tool allows you to resolve any merge conflicts directly in Sublime Merge, rather than having to open up your editor of choice.Д¬onflicts are presented with a 3-pane view. Stage Files, Hunks and Lines with no waiting вЂ“ Sublime Merge is really, really fast. A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Meet a new Git Client, from the makers of Sublime Text.

Sublime merge download