sublime-text2比较工具

http://www.sublimerge.com/#installation

 

• overview
 
• features
 
• changelog
 
• documentation
 
• support
 
• buy

SublimergeThe professional diff and merge tool for Sublime Text 2 and 3

 

@sublimerge

Buy for $19Per user on any number of computers.Evaluate a Free TrialNo time and functionality limitations.

Available for:

• 
 
• 
 
• 

Works with:

• 
 
• 
 
• 

Current release: 2.8.7

Why do you need it?

A few reasons why you should give it a try.

• Side-by-side diff viewsNever lose your context. When you scroll one pane, the others stay in sync.
• Compare and merge filesBuilt-in 2-way and 3-way diff algorithms will help you compare and merge files.
• Compare and merge directoriesBrowse, compare and apply changes between directories in side-by-side view.
• Built-in commands for Git, Mercurial and SubversionPredefined commands will improve your workflow with branches and revisions.
• Integrate with anythingRun Sublimerge from command line and integrate it with any other app.
• Compare to clipboard contentsJust copy a text from anywhere you want and compare current view to it.
• Create, manage and compare code snapshotsUse snapshots to compare or even revert your code to selected point in time.
• Compare selections within one or more filesQuickly compare and spot differences between selected fragments of files.
• Create your own custom commandsDefine your own Custom Comparisons to make yourself even more productive.
• Fully customizable settingsA great number of settings lets you tune Sublimerge exactly to your needs.

Want to know more? See all features.

Screenshots

Some of features. In action.

• Main commands menu
• Diff View - multiple selection
• Diff View - differences navigator
• Diff View - context menu
• Compare to Revision... - Diff View
• Directories comparison
• Three-way diff - 3-column layout
• Three-way diff - 2-row layout
• Compare to View...
• Compare to Revision...
• Compare to Other Branch...
• Show Changes Between Current and Remote...
• Editor - context menu
• Tab - context menu
• Side Bar - Compare Selected Files
• Side Bar - Compare Selected Directories

There is more! Read about all features or install and try it yourself.

Installation

Already have 16,179+ 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!