Sublimerge 3 documentation

Quick Start

You are viewing documentation for Sublimerge 3 which is currently in beta. It may happen that this documentation is not 100% complete and up-to-date. It may also describe features and/or settings that are not yet available in published version. If you're looking for Sublimerge Pro documentation, please proceed here.

Prerequisites

Sublime Text 3

Sublimerge is a plugin, not a standalone application. Thus it requires Sublime Text 3 to work.

Your operating system does not matter - Sublimerge works on every platform supported by Sublime Text: OS X, Windows and Linux.

VCS systems (optional)

The following Version Control Systems are supported, however their existence is not required:

Git
Subversion (SVN)
Mercurial (Hg)

Learn about built-in commands for VCS systems: Tutorial/Comparing versioned files.

Learn how to define your own custom commands: Macros.

Learn how to run Sublimerge from command line: VCS integration.

Installation

With Package Control

Recommended. Package Control does not require your attention to keep Sublimerge up to date. All updates will be installed automatically as soon as they are released.

Install the Package Control (if you haven't already)
Open Command Palette (ctrl + shift + p on Windows and Linux, cmd + shift + p on Mac)
Choose Package Control: Install Package
Search for Sublimerge 3 and hit enter
Restart Sublime Text to complete the installation

Manually from Package

Not recommended. You will need to stay tuned with Sublimerge updates and install them manually. You can follow @sublimerge on Twitter to get notifications about new releases.

Download Package: Sublimerge 3.sublime-package
Go to Preferences > Browse Packages...
Go one folder up
Go to Installed Packages
Copy the package to that directory
Restart Sublime Text

Installing License

Without a License, Sublimerge runs in evaluation mode. You will have 90 days to evaluate Sublimerge without any functionality limitations. Later you will need to purchase a License. Evaluation copy will display a cyclic reminder message.

Sublimerge 3 accepts a license for Sublimerge Pro (2.x) as long as it is in beta. Later you will need to upgrade your license.

Once License is purchased, take the following steps to install it:

Go to Preferences > Package Settings > Sublimerge
Select Enter License
Paste your license key in the textbox appearing in the bottom
Press enter

When License Key is installed successfuly, confirmation message will appear. Otherwise, if you get error message, please check if you entered License Key correctly without any mistakes.