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 107K
  • Win 52K
  • OS X 39K
  • Linux 16K
Jun 23 Jun 22 Jun 21 Jun 20 Jun 19 Jun 18 Jun 17 Jun 16 Jun 15 Jun 14 Jun 13 Jun 12 Jun 11 Jun 10 Jun 9 Jun 8 Jun 7 Jun 6 Jun 5 Jun 4 Jun 3 Jun 2 Jun 1 May 31 May 30 May 29 May 28 May 27 May 26 May 25 May 24 May 23 May 22 May 21 May 20 May 19 May 18 May 17 May 16 May 15 May 14 May 13 May 12 May 11 May 10 May 9
Windows 28 48 34 38 31 7 17 46 43 44 40 37 12 21 51 29 50 65 45 20 48 80 53 44 16 18 9 30 39 53 52 47 36 17 13 52 35 61 35 42 7 9 56 47 42 29
OS X 13 25 18 21 15 8 8 14 16 21 22 16 10 4 34 16 22 18 22 4 16 16 25 20 18 11 4 10 17 22 24 21 16 4 7 17 20 21 26 20 9 6 20 16 24 18
Linux 0 11 7 5 2 0 3 8 6 5 6 1 13 1 2 5 4 2 2 5 3 4 6 4 7 8 0 2 5 4 6 3 4 3 3 8 9 8 4 4 2 1 8 5 6 5

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.