Sublimerge 3
Text Diff Still very minimalistic but even more powerful. Discover the Live Diff!
Sublimerge 3 makes it extremely easy to work with compared files. All the differences are marked in the gutter so the text area remains clear and waits for your input. All your modifications are immediately reflected as you type. Cut, copy & paste the text. Thanks to unlimited undo/redo stack you don't have to worry about mistakes. It all just works.
- Live Diff!
- Handles whitespace, case and CR/LF differences
- Highlights intraline changes
- Easy keyboard navigation
- Incredibly configurable!
- Run from command line!
Side-by-side
Just like in other diff tools, the view splits into two panes showing compared files and all differences between them. Views are in sync with each other so you will never lose the context.Readable
Colorful gutter lines shows clearly which fragments are different or missing. Intraline changes are also highlighted to focus your eyes on small changes.Flexible
Can ignore case and CR/LF differences. You can also decide how to treat whitespace differences using any combination of the following: line begin, middle and end.Three-way Text Diff Resolve merge conflicts without leaving Sublime Text
Configure Sublimerge as your diff & merge tool and resolve conflicts easily right in your editor. Advanced merging capabilities will be your secret weapon. Resolve conflicts one-by-one by using advanced merge commands. If it's still too less, remember that Live Diff also works in three-way mode!
- Live Diff!
- Handles whitespace, case and CR/LF differences
- Highlights intraline changes
- Easy keyboard navigation
- Removes temporary merge files created by VCS
- Incredibly configurable!
- Run from command line!
Side-by-side
The merge view supports two layouts you can choose from: three-columns and two-rows. Just choose the one you feel the most comfortable with!Readable
Sublimerge marks conflicts with red exclamation marks and makes them easy to spot. All other changes are displayed like in regular diff view.Powerful
Sublimerge makes resolving conflicts extremely easy. Choose from advanced merge commands and type directly in the merged file.Directories Diff Easily compare nested directories right in Sublime Text
Sublimerge compares directories side-by-side, digging down in the hierarchy. When a directory contains any difference at any level, it gets marked as different. When you find differences, you can simply clone files or directories from one side to the other. You can also run Text Diff for selected text files right in the same window!
- Compare directories in side-by-side view
- Quickly merge files and directories
- Browse subdirectories
- Run full-featured Text Diff right in place
Side-by-side
Compare directories side-by-side and easily spot the differences. Compare files in place!Readable
Colorful gutter lines shows clearly which files or directories are different or missing.Version Control Systems Built-in Git, Subversion and Mercurial features
Sublimerge comes with predefined commands that will improve your workflow with versioned files. For instance, you can quickly compare your working copy to any revision. You can even view, verify and revert uncommited changes. That's magically simple. If this is still too less, you can define your own commands using Macros feature.
- Built-in commands for Git, Subversion and Mercurial
- Easily compare your working copy with revisions
- Spot differences between any revisions
- View, verify or revert uncommited changes
- Boost your workflow with Macros
- Run from command line!
Built-in
No special tools required. Just open a versioned file and all VCS-related commands become available automatically. Perform your daily tasks quickly without leaving Sublime Text!Customizable
Boost your daily workflow with powerful Macros feature. Create your own VCS-related (and not only) commands to work with revisions, branches and so on.Integratable
Integrate with anything. Run Sublimerge from command line or even configure your VCS to use it as its diff and merge tool. Use Sublimerge to resolve your merge conflicts.Customize your Workflow Built-in featured Macros engine
With Macros you can create custom commands to work with Git, Subversion and Mercurial, or even run custom shell commands, capture the output and compare right inside Sublime Text! Macros have a simple JSON structure that makes them easy to understand and implement.
- Easy to understand and write JSON syntax
- Built-in variables to access environment information
- Built-in variables modifiers to transform the values
- Built-in directives for data manipulation and flow
- Built-in support for Git, Mercurial and Subversion
- Support for regular expressions to parse input data
- Easy access to shell environment
- OS X, Linux and Windows support
Cross-platform
The Macros API is transparent for OS X, Linux and Windows so it is easy to write platform-independent code. In some special cases you can define a Macro for selected OS only.VCS support
You can define what kind of VCS the Macro requires. When current file is versioned by defined VCS, the Macro will become available automatically in Sublimerge's menu and Command Palette.JSON syntax
Macros uses JSON which is clean and lets you implement the flow in a declarative way. The structure of a Macro is divided into steps so it's easy to understand what it does and how.Details
System requirements
Built-in support for
General
- Live Diff Type directly in two and three-way view.
- Undo & Redo Don't worry about mistakes!
- Split View Side-by-side & swapable diff view.
- Featured Diff Two-way and three-way diff algorithms.
- Patience Diff algorithm The best diff algorithm for source code.
- Ease Of Use Simple keyboard & mouse shortcuts.
- Diff Selections In one file or across multiple files.
- Diff Views Easily compare currently edited files.
- Clipboard Support Compare with clipboard contents.
- VCS Support Built-in commands for Git, Subversion and Mercurial.
- Save & stay No longer close Sublimerge upon saving a file.
- View Unsaved Changes Quickly show changes which makes your file dirty.
- Macros Boost your workflow with custom commands.
- Snapshots Create code snapshots and compare to them.
- High Performance Performs the job quickly. Even with big files.
- Directories Diff Compare directories and apply changes.
- Syntax specific settings Define different settings for different file types.
- Integratable Run from command line & integrate with anything.
- Customizable colors Customize colors using hexadecimal notation.