Sublimerge

The professional diff and merge PLUGIN for Sublime Text 2 and 3. SUBLIMERGE IS NOT SUBLIME MERGE - PLEASE DO NOT CONFUSE

[Sublimerge @sublimerge]

@sublimehq recently published Sublime Merge. Please do not confuse Sublime Merge with Sublimerge. I put the information on my purchase and support pages, but people seems to be still confused. Please read before purchasing or sending a message.

[Sublimerge @sublimerge]

Sublimerge 3.0.32 released! Git users will definitely love new built-in Macros for resolving merge conflicts: "List and Resolve Conflicts...", "Resolve Conflicts in Current File". Want to create a Macro? Finally there are the docs: https://t.co/FQS1LnIZ5e

[Sublimerge @sublimerge]

Sublimerge 3.0.31 released! Added support for the latest Sublime Text's JSON color schemes, misc. bug fixes and improvements. https://t.co/WiOqu3pxWX #sublimetext

[Sublimerge @sublimerge]

Sublimerge 3.0.26 beta released. This one-fix update solves one very annoying issue of not returning git mergetool under Linux.

[Sublimerge @sublimerge]

@rickarankin thanks. The package was broken. Please try again now.

[Sublimerge @sublimerge]

@andreibc I try to reply to all e-mails I receive. It seems I did not get them. Please describe your probem again and I will try to help you

[Sublimerge @sublimerge]

@andreibc if you have some problem with Sublimerge, please share via [email protected]. It doesn’t crash any of my Sublime’s instances

[Sublimerge @sublimerge]

@andreibc Can you please submit some details? [email protected]

[Sublimerge @sublimerge]

Sublimerge v2.10.12 and v3.0.20 are out. Please upgrade if you're experiencing the issue of losing license information.

[Sublimerge @sublimerge]

@gcman105 Thank you for purchasing! :) You can as long as you're the only user.

[Sublimerge @sublimerge]

Sublimerge 3.0.18 beta released! Should be available in Package Control soon. https://t.co/H5ZZ31vj56 #sublimetext

[Sublimerge @sublimerge]

@iovis9 thanks! :)

[Sublimerge @sublimerge]

4 yrs ago Sublimerge was born. v1.0 had ~900 lines of code. Today v3 has over 15K lines. This is how it all begin:

[Sublimerge @sublimerge]

Sublimerge 3.0.16 beta released! Next portion of bug fixes and improvements. https://t.co/H5ZZ31vj56 #sublimetext

[Sublimerge @sublimerge]

Sublimerge 3.0.14 released! This is the first release I made from the train! :) #sublimetext #pkp

[Sublimerge @sublimerge]

Sublimerge 3.0.12 beta released. Fixed reported issues related to Directories Diff. https://t.co/H5ZZ31MTWE #sublimetext

[Sublimerge @sublimerge]

Yay! Today is the 3rd day after SM3 beta release. 1K installs already! https://t.co/WiOqu3pxWX @SublimePackages @Package_Control @sublimehq

[Sublimerge @sublimerge]

Sublimerge 3.0.11 beta released. Fixes for reported issues. https://t.co/H5ZZ31vj56 #sublimetext

[Sublimerge @sublimerge]

@OdatNurd Thank you. Enjoy! :)

[Sublimerge @sublimerge]

It may take some time for Sublimerge 3 to appear in the Package Control so please be patient.