ctrl+shift+p filters: :st2 :st3 :win :osx :linux
Browse

Sublimerge Pro

by Borys Forytarz ST2/ST3

Side-by-side diff & merge tool to compare files and directories. Work with differences between text and revisions. Supports Git, SVN, Mercurial and command line. Primarily for ST2. ST3 users should install even more feature-rich Sublimerge 3.

Details

Installs

  • Total 126K
  • Win 65K
  • OS X 44K
  • Linux 17K
Sep 20 Sep 19 Sep 18 Sep 17 Sep 16 Sep 15 Sep 14 Sep 13 Sep 12 Sep 11 Sep 10 Sep 9 Sep 8 Sep 7 Sep 6 Sep 5 Sep 4 Sep 3 Sep 2 Sep 1 Aug 31 Aug 30 Aug 29 Aug 28 Aug 27 Aug 26 Aug 25 Aug 24 Aug 23 Aug 22 Aug 21 Aug 20 Aug 19 Aug 18 Aug 17 Aug 16 Aug 15 Aug 14 Aug 13 Aug 12 Aug 11 Aug 10 Aug 9 Aug 8 Aug 7 Aug 6
Windows 4 62 35 41 14 17 38 48 42 64 39 23 21 41 44 35 36 48 15 16 52 54 53 55 45 12 7 27 55 36 43 31 20 12 40 48 42 40 54 11 14 41 47 53 42 49
OS X 0 24 16 18 6 7 21 12 21 29 12 5 4 13 18 24 22 21 3 6 15 17 16 18 15 11 4 15 23 23 12 15 6 5 19 18 12 18 22 10 8 18 14 24 21 16
Linux 0 4 2 3 1 2 3 14 1 5 4 1 1 3 6 4 6 5 2 2 6 4 5 8 6 0 1 4 3 6 1 7 1 3 10 2 8 4 2 3 1 4 5 3 5 4

Readme

Source
sublimerge.​com

Please visit www.sublimerge.com for complete information about features, installation instructions, usage and settings.

Sublimerge

Works on OS X   Works on Windows   Works on Linux                                    Supports Git   Supports SVN   Supports Mercurial

Full Sublime Text integration

Sublimerge fully integrates into your editor, no matter what your operating system is. Forget about external tools just to check differences between files, their revisions or even their fragments. You get it all built-in. Out of the box.

Version Control Systems support

Is your file versioned under Git, SVN or Mercurial? Great! You can instantly check the differences between your working copy and any revision you like. Then simply merge selected changes if you want to.

Version Control Systems integration

You can setup Sublimerge as diff and merge tool for Git, Subversion, Mercurial and others. You can select one of two possible layouts for three-way diff view: 3-column or 2-rows.

Directories comparison

Use Sublimerge to compare directories side-by-side. Just select two directories in Side Bar and from its context menu select Sublimerge -> Compare Selected Directories.

Simplicity & Productivity

Everything you need to do is to learn a few keyboard or mouse shortcuts to make your work with diffs more productive. If you are lazy, every command is available from context menus and Command Palette. Just that simple.

Snapshots

Create snapshots of your code to store temporarily important changes. Later merge your changes from snapshots or even fully revert to given point in time. Snapshots can be created manually and/or each time you open or save file.

Showing differences

Colorful gutter icons and outlines around change blocks will show you clearly which fragments are different or missing. Intraline changes will be also highlighted to help you focus your eyes on small differences.

Custom Comparisons

Define custom commands where you can decide what and how to compare. Sublimerge comes with a few predefined Custom Comparisons for Git, SVN and Mercurial users which allows you to compare and merge files across branches and view uncommited changes. You can also define your own comparisons to do custom things.


Please visit www.sublimerge.com for complete information about features, installation instructions, usage and settings.