When a directory contains any difference at any level, Sublimerge compares directories side-by-side, digging down in the hierarchy. Remember that Live Diff also works in three-way mode! Resolve conflicts one-by-one by using advanced merge commands. Advanced mergingĬapabilities will be your secret weapon. It all just works.Ĭonfigure Sublimerge as your diff & merge tool and resolve conflicts easily right in your editor. Thanks to unlimited undo/redo stack you don't have to worry about mistakes. All your modifications are immediately reflected as you type.Ĭut, copy & paste the text. All the differences are marked in the gutter so the textĪrea remains clear and waits for your input. Sublimerge 3 makes it extremely easy to work with compared files. Read further, visit for complete reference or, even better, install now and discover all the features. Configure anything! Colors, behavior, commands, diff algorithm and more. Run Sublimerge from command line and integrate with anything. Easily implement your own diff commands using the Macros feature. Supports Git, Mercurial and Subversion.Use Sublimerge to compare opened files, selections, clipboard and much more. The differences are marked with colorful lines. Scroll one, the other will sync automatically. The diff panes are in sync with each other. Sublimerge's undo/redo stack is unlimited. Compare directories side-by-side right in Sublime Text. The best diff algorithm for source code is enabled by default. Just like in the best diff tools available on the market. Integrate with your VCS and use Sublimerge's advanced features to resolve merge conflicts. Unlike in other plugins, the diff view is editable. Side-by-side two-way and three-way diff that runs right inside Sublime Text! Forget switching again and again to external apps - now you get it all built-in! It is the most advanced, full-featured plugin which will turn your favorite editor into the professional diff and merge tool with amazing features! Your time is your money so no longer waste it. Please send us an email if you wish to claim a refund.Sublimerge is not yet another diff plugin for Sublime Text. Refunds are available within 30 days of purchasing. There are currently no plans to sell via the Mac App Store. License keys are owned by the business, and may not be shared with other companies or individuals. Taking a Business License HomeĮmployees should not use a business license at home, unless on a work computer or for work purposes. Site licenses and group buying are not offered. In the former case, it will be necessary to allocate one seat per computer. You may purchase the lesser of either: 1) the number of computers that will have our product installed or 2) the number of students who will be using it. If you would like to purchase a subscription for use in a computer lab, it is not necessary to have the number of seats equal to the number of students. The number of seats can be changed at any time, as can the allocation of seats.īusiness licenses will expire when the subscription is cancelled, while personal licenses will remain valid forever, with updates for 3 years.Īll license keys will have an individuals name on them. For a business, first you purchase a subscription with a given number of seats, and then allocate the seats to individual users. Business vs Personalīusiness licenses are associated with a subscription, but are still tied to individuals. However, personal licenses are only available for personal ownership: businesses and organizations must purchase a business license. Using a Personal License at WorkĪs licenses are per-user, you're welcome to use your license key on all computers where you are the primary user, including at work. Licenses are per-user, so you're welcome to use the one license on all computers and operating systems where you are the primary user. Only if you wish to use newer versions will an upgrade fee be required.īusiness subscription licenses are valid for as long as the subscription is active. Individual licenses are valid for 3 years of updates, but do not expire after 3 years. Any versions released 3 years or more after the purchase date will require a paid upgrade to use. After 3 years, you'll be able to continue to use the last version released within 3 years of purchase (in other words, licenses do not expire). Personal licenses come with 3 years of updates. Please enable JavaScript Education DiscountsĮducational discounts are not presently offered.
0 Comments
Leave a Reply. |