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

Sublimerge Pro

by Borys Forytarz ST2/ST3

Side-by-side tool to diff and merge files and directories. Supports Git, SVN and Mercurial.

Details

Installs

  • Total 104K
  • Win 50K
  • OS X 39K
  • Linux 16K
Apr 25 Apr 24 Apr 23 Apr 22 Apr 21 Apr 20 Apr 19 Apr 18 Apr 17 Apr 16 Apr 15 Apr 14 Apr 13 Apr 12 Apr 11 Apr 10 Apr 9 Apr 8 Apr 7 Apr 6 Apr 5 Apr 4 Apr 3 Apr 2 Apr 1 Mar 31 Mar 30 Mar 29 Mar 28 Mar 27 Mar 26 Mar 25 Mar 24 Mar 23 Mar 22 Mar 21 Mar 20 Mar 19 Mar 18 Mar 17 Mar 16 Mar 15 Mar 14 Mar 13 Mar 12 Mar 11
Windows 2 38 14 10 36 44 55 41 32 15 14 32 30 33 28 35 12 7 30 40 21 24 25 10 17 35 38 25 43 44 11 5 32 38 20 32 15 10 6 24 28 27 26 25 9 6
OS X 0 22 5 6 15 27 22 27 15 3 6 22 15 23 16 21 5 7 16 20 23 15 19 8 5 15 21 12 22 21 4 5 15 14 17 10 9 4 6 15 15 15 12 10 6 3
Linux 0 5 6 3 3 6 5 5 5 3 1 3 2 8 9 13 1 1 3 5 6 4 4 2 3 4 3 6 6 6 1 2 6 3 3 8 5 0 4 4 5 4 5 0 3 2

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.