Sublimerge 3 (beta) has just been installed. Thanks for trying it out!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! !!
!! NOTE: THIS IS A BETA VERSION. PLEASE REPORT ANY BUGS YOU MAY ENCOUNTER. !!
!! !!
!! !!
!! http://www.sublimerge.com/support.html [email protected] !!
!! !!
!! Issue Tracker: https://bitbucket.org/borysforytarz/sublimerge-3/issues?status=new&status=open !!
!! !!
!! !!
!! !!
!! Please visit http://www.sublimerge.com/sm3/docs/ for more information. !!
!! !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
By default Sublimerge's colors theme conforms to default Sublime Text theme. If you are using some custom theme and find the colors poorly visible, you may need to change them.
-
If you're on Windows and want to use VCS-related commands, you may need to configure the executable path for your VCS. Linux and OS X users with non-standard VCS installation may need to configure this too.
Please visit http://www.sublimerge.com/sm3/docs/configuration.html for more information about configuration.
In file view:
[ctrl]+[alt]+[d] - display Quick Panel with commands available for current view
In diff view:
Windows/Linux:
[ctrl]+[down] - select next change
[ctrl]+[up] - select previous change
* [ctrl]+[left] - copy selected change (or active line) to left from right
* [ctrl]+[right] - copy selected change (or active line) to right from left
[ctrl]+[shift]+[left] - copy all changes to left from right
[ctrl]+[shift]+[right] - copy all changes to right from left
OSX:
[alt]+[down] - select next change
[alt]+[up] - select previous change
* [alt]+[left] - copy selected change (or active line) to left from right
* [alt]+[right] - copy selected change (or active line) to right from left
[alt]+[shift]+[left] - copy all changes to left from right
[alt]+[shift]+[right] - copy all changes to right from left
Common:
[f3] - swap panels
[f4] - show changes navigator
[f5] - recompare buffers
* - if change is selected the command will copy its whole contents, otherwise will copy only the focused line
In directories diff view:
[down] - select next file/directory
[up] - select previous file/directory
[left] - copy file/directory from right to left
[right] - copy file/directory from left to right
[enter] - enter sub directory / compare text files
[backspace] - enter parent directory
Windows/Linux:
[ctrl]+[down] - select next different file/directory
[ctrl]+[up] - select previous different file/directory
OS X:
[alt]+[down] - select next different file/directory
[alt]+[up] - select previous different file/directory
For convenience Sublimerge also supports standard OS X keyboard shortcuts for directories navigation:
[cmd]+[down] - enter sub directory / compare text files
[cmd]+[up] - enter parent directory
-
LICENSES SUBLIMERGE is licensed as follows: a) Evaluation time. You can evaluate SUBLIMERGE freely for 90 days. Later you will need to purchase a license for continued use. b) Installation and Usage. Licenses are per user and valid for use on all supported operating systems. License keys may be used on multiple computers and operating systems, provided the license key holder is the primary user. Businesses must purchase at least as many licenses as the number of people using SUBLIMERGE. c) Backup Copies. You may make copies of the license key and/or SUBLIMERGE for backup and archival purposes. d) Evaluation time. You can evaluate SUBLIMERGE freely for 90 days. Later you will need to purchase a license for continued use.
-
ILLEGAL USAGE Any illegal usage of SUBLIMERGE, including reverse engineering, using unauthorized license keys, creating keygens and cracks is prohibited and will be subject for prosecution.
-
DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS a) Maintenance of Copyright Notices. You must not remove or alter any copyright notices on any copy of SUBLIMERGE.
b) Distribution. You may not distribute or sell license keys or SUBLIMERGE to third parties. Licenses will be revoked if distributed or sold to third parties.
c) Rental. You may not rent, lease, or lend the license key or SUBLIMERGE.
-
COPYRIGHT All title, including but not limited to copyrights, in and to SUBLIMERGE and any copies thereof are owned by BORYS FORYTARZ (AUTHOR).
-
REFUND POLICY Refunds are not available. Because of this, before purchasing a license, you can evaluate SUBLIMERGE without any functionality limitations for 90 days. Later you will need to purchase a license.
-
NO WARRANTIES AUTHOR expressly disclaims any warranty for SUBLIMERGE, which is provided 'as is' without any express or implied warranty of any kind, including but not limited to any warranties of merchantability, non-infringement, or fitness of a particular purpose.
-
LIMITATION OF LIABILITY In no event shall AUTHOR be liable for any damages due to use of SUBLIMERGE, to the maximum extent permitted by law. This includes without limitation, lost profits, business interruption, or lost information. In no event will AUTHOR be liable for loss of data or for indirect, special, incidental, consequential (including lost profit), or other damages. AUTHOR shall have no liability with respect to the content of SUBLIMERGE or any part thereof, including but not limited to errors or omissions contained therein, libel, trademark rights, business interruption, loss of privacy or the disclosure of confidential information.
For more information, troubleshooting, customizing settings and more, please visit www.sublimerge.com
Take a break from your work and play my BF's Draughts on your iOS device! Available on the App Store! :)