Sublimerge 3

Sublimerge 3

Current release: 3.0.26 beta (Tue, 31 Jan 2017 15:22:04 +0100)

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.

Text Diff
  • 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!

Three-way Text Diff
  • 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!

Directories Diff
  • Compare directories in side-by-side view
  • Quickly merge files and directories
  • Browse subdirectories
  • Run full-featured Text Diff right in place

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.

Commands for Version Control Systems
  • 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.

What about my license? No worries!

At a Glance

It's important to know that Sublimerge 3 is being written from scratch. This approach allows me to take all the benefits from Sublime Text 3 API and implement all these great features that were not possible to implement in Sublimerge 2. Because of this, Sublimerge 3 is a separate product, licensed separately with a different price.

That's why I came up with the following solution which, in my feeling, is fair for existing users, new users and, finally, me.

I prepared two upgrade plans for those who already own a Sublimerge Pro (2.x) license:

  1. Get a discount and just pay the difference between Sublimerge 3 price and amount you spent on Sublimerge Pro.
  2. Instead, if you want to show more appreciation to my work, you can purchase it for a regular price :)

FAQ

  1. Can existing users get a discount?

    Yes. Existing users can get a discount.
  2. Will license for Sublimerge 3 work with Sublimerge Pro?

    By purchasing a license for Sublimerge 3 you will get also additional license key for Sublimerge Pro.
  3. Will my license for Sublimerge Pro work after upgrade?

    Yes. Your license for previous version will remain valid. In fact, you will have two separate licenses - one per each version.
  4. Does my license for Sublimerge Pro work with Sublimerge 3?

    Yes, but as long as Sublimerge 3 is in beta. Later you will need to upgrade.

If you don't have a license yet but like Sublimerge and want to support me, please purchase it. It is not too expensive and, as you can see above, you don't lose your money!

Work on Sublimerge costs me a lot of effort and my spare time so each purchased license motivates me to keep my work up! 🙂

In case of any doubts, please contact me.

Details

System requirements

  • OS X
  • Windows
  • Linux

Built-in support for

  • Git
  • Subversion
  • Mercurial

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.

Already installed by 25,157+ users. Become the next one!

Evaluate a Free Trial

By the way...

BF's Draughts

BF's Draughts

Take a break in coding and relax playing my Draughts (Checkers) game. BF's Draughts is a modern, rich and highly customizable game for iOS. Choose from variety of built-in game variants, play against intelligent AI or people around the world. Don't wait and download for FREE from the App Store.

I serve cookies to improve your experience on this website. If you continue without changing your browser settings, I will assume that you accept the cookies. You can change your browser settings at any time.