sublimerge
Package Control Messages
========================
Sublimerge 3
------------
Sublimerge 3 (beta) has just been installed. Thanks for trying it out!
It is highly recommended to restart Sublime Text before first use.
------------------------------------------------------------------
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! !!
!! NOTE: THIS IS A BETA VERSION. PLEASE REPORT ANY BUGS YOU MAY ENCOUNTER. !!
!! !!
!! !!
!! http://www.sublimerge.com/support.html support@sublimerge.com !!
!! !!
!! Issue Tracker: https://bitbucket.org/borysforytarz/sublimerge-3/issues?status=new&status=open !!
!! !!
!! !!
!! !!
!! Please visit http://www.sublimerge.com/sm3/docs/ for more information. !!
!! !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
The first steps after installation
==================================
1. 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.
2. 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.
Simplified usage instructions
=============================
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
End-User License Agreement (EULA)
=================================
1. 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.
2. 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.
3. 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.
4. COPYRIGHT
All title, including but not limited to copyrights, in and to SUBLIMERGE and any copies
thereof are owned by BORYS FORYTARZ (AUTHOR).
5. 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.
6. 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.
7. 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.
More information
================
For more information, troubleshooting, customizing settings and more, please visit www.sublimerge.com
By the way...
=============
Take a break from your work and play my BF's Draughts on your iOS device!
Available on the App Store! :)
http://www.bfdraughts.com/as/
sublimerge的更多相关文章
- sublime文件对比插件--sublimerge
网上很多文件对比的基本都要收费,所以还是干脆看看sublime有没插件算了. 结果还是有一个:sublimerge 1 先安装该插件: 2 然后在sublime下都打开要对比的两个文件: 3 然后在其 ...
- Sublime Text各种插件使用方法
有快捷键冲突的时候可以修改快捷键,建议修改插件快捷键而不是Sublime Text的快捷键,我的有冲突的一律将插件快捷键设置成:Ctrl+Alt+A(B...) Package Control 通俗易 ...
- 开发工具之Sublime编辑器
sublime是一款轻量级的编辑器,可以从官网上进行下载最新版本.它有很多使用并且强大的功能支持.例如:GOTO,package 等快捷操作.但有时候下载的版本不能进行安装package contro ...
- 非常实用的Sublime插件集合 – sublime推荐必备插件
插件介绍 ***PackageControl*** 功能:安装包管理 简介:sublime插件控制台,提供添加.删除.禁用.查找插件等功能 使用方法: 1.安装好控制台,如有不能正常调用 Packag ...
- Sublime Text 实用方法
代码比对 安装Sublimerge插件 打开Sublime Text后,接着按Ctrl+Shift+P,并输入Install Package 待其加载完成,再输入Sublimerge Pro 当安装完 ...
- sublime text 3 前端开发常用插件
sublime text 3 前端开发常用插件 https://packagecontrol.io/browse 代码对齐: Alignment html代码补全: Emmet CoffeeScri ...
- JS-立即执行函数表达式(IIFE)
javascript 函数调用 在 javascript 中,每一个函数在被调用的时候都会创建一个执行上下文,在该函数内部定义的变量和函数只能在该函数内部被使用,而正是因为这个上下文,使得我们在调用函 ...
- 如何安装 Sublime text 编辑器相关的插件
Sublime是一个伟大的编辑器,具有可靠的基础功能,使编写代码变得愉快.您可以安装一个包管理器,以便于安装插件和添加新功能. 为什么使用包管理器(package manager) 包管理器可以方便地 ...
随机推荐
- APT攻击与银行
APT与传统攻击 APT:团队作战,拥有自研工具集,意图明确,技术高超,拥有政府或商业背景,潜伏期多达数年. 传统攻击:脚本小子,水平参差不齐,短期攻击,直接获取利益为目标. 攻击目标 APT攻击链 ...
- linux 软连接【转】
https://www.cnblogs.com/kex1n/p/5193826.html这是linux中一个非常重要命令,请大家一定要熟悉.它的功能是为某一个文件在另外一个位置建立一个同不的链接,这个 ...
- 钩子(hook)
钩子(hook)编程 钩子(hook)编程 一.钩子介绍 1.1钩子的实现机制 钩子英文名叫Hook,是一种截获windows系统中某应用程序或者所有进程的消息的一种技术.下图是windows ...
- context.xml文件配置
<?xml version='1.0' encoding='utf-8'?> <Context> <WatchedResource>WEB-INF/web.xml& ...
- RestTemplate对象的使用
- LeetCode 171. Excel表列序号(Excel Sheet Column Number) 22
171. Excel表列序号 171. Excel Sheet Column Number 题目描述 给定一个 Excel 表格中的列名称,返回其相应的列序号. 每日一算法2019/5/25Day 2 ...
- STL源码剖析——空间配置器Allocator#3 自由链表与内存池
上节在学习第二级配置器时了解了第二级配置器通过内存池与自由链表来处理小区块内存的申请.但只是对其概念进行点到为止的认识,并未深入探究.这节就来学习一下自由链表的填充和内存池的内存分配机制. refil ...
- WUSTOJ 1311: 开心的金明(Java)动态规划-01背包
题目链接:
- Python3遍历指定文件夹下所有文件及文件夹
采用os模块儿: import os def get_filelist(dir): for home, dirs, files in os.walk(dir): print("####### ...
- Smart3D飞控&地方坐标系
资源 ContextCapture(原Smart3D)教程 | Wish3D 航测数据处理答疑55问!涉及CC.Pix4D.Photoscan.EPS等常见软件问题_云进行 飞控软件 Smart3D常 ...