This extension provides integration with the Sublime Merge Git client.

Requirements

This extension requires some additional tools to be installed on your Mac:

• Sublime Merge
• The smerge command-line utility, if you want to use the “blame” and file history features.

Usage

To access the commands:

• Open the command palette and type Sublime Merge

The available workspace commands are:

• Open Workspace in Sublime Merge
  • The default keyboard shortcut is Shift-Cmd-M

The following commands are available when editing a file that has previously been saved:

• Blame in Sublime Merge—show the Git blame view in Sublime Merge
• View file history in Sublime Merge—show the file’s history in Sublime Merge

Keyboard shortcuts

To set keyboard shortcuts for any of the above commands, use Nova’s key bindings feature.

Attribution

Icon: Merge by Dmitry Baranovskiy from the Noun Project CCBY