Looking for Gerrit Code Review and Sublime Text integration? Take a look at SublimeGerrit!

Sublimerge The professional diff and merge tool for Sublime Text 2 and 3

Sublimerge
Available for:
  • OS X
  • Windows
  • Linux
Works with:
  • Git
  • Subversion
  • Mercurial
Current release: 2.8.8

Why do you need it?

A few reasons why you should give it a try.

  • Side-by-side diff views Never lose your context. When you scroll one pane, the others stay in sync.
  • Compare and merge files Built-in 2-way and 3-way diff algorithms will help you to compare and merge files.
  • Compare and merge directories Browse, compare and apply changes between directories in side-by-side view.
  • Built-in commands for Git, Mercurial and Subversion Predefined commands will improve your workflow with branches and revisions.
  • Integrate with anything Run Sublimerge from command line and integrate it with any other app.
  • Compare to clipboard contents Just copy a text from anywhere you want and compare current view to it.
  • Create, manage and compare code snapshots Use snapshots to compare or even revert your code to selected point in time.
  • Compare selections within one or more files Quickly compare and spot differences between selected fragments of files.
  • Create your own custom commands Define your own Custom Comparisons to make yourself even more productive.
  • Fully customizable settings Great number of settings lets you tune Sublimerge exactly to your needs.
Want to know more? See all features.

Installation

Already have 33,674+ users. Be the next one :)
Number updated hourly from Package Control statistics.

Without a license, Sublimerge runs in evaluation mode. There are no time and functionality limitations, but for continuous usage it requires purchasing a license. Unregistered copy will display a cyclic reminder message.

Install 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.

Make sure you use the final version of Package Control. Alpha versions may not install Sublimerge correctly and it will not work resulting in loading errors.

  1. Install the Package Control (if you haven't already)
  2. Open Command Palette ([ctrl]+[shift]+[p] on Windows and Linux, [cmd]+[shift]+[p] on Mac)
  3. Choose Package Control: Install Package
  4. Search for Sublimerge Pro and hit [Enter]
  5. Restart Sublime Text to complete the installation

If Sublimerge Pro package is disabled after installation, take the following steps to enable it:

  1. Open Command Palette
  2. Choose Package Control: Enable Package
  3. Search for Sublimerge Pro and hit [Enter]
  4. Restart Sublime Text
Manual installation

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.

Also use this installation method if you don't use final version of Package Control. Please visit Support page for more details.

  • Sublime Text 2
    1. Download ZIP: Sublimerge Pro.zip
    2. Go to Preferences > Browse Packages...
    3. Create directory Sublimerge Pro
      Directory must be empty and its name must be exactly as above!
    4. Extract the ZIP into that directory
    5. Restart Sublime Text
  • Sublime Text 3
    1. Download Package: Sublimerge Pro.sublime-package
    2. Go to Preferences > Browse Packages...
    3. Go one folder up
    4. Go to Installed Packages
    5. Copy the package to that directory
    6. Restart Sublime Text
Stay up to date! Follow @sublimerge on Twitter!