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) 包管理器可以方便地 ...
随机推荐
- 通过iis启动服务,会产生C:/inetpub/logs/logsFile产生大量的日志,定期清理
[转]https://www.cnblogs.com/Martianhh/p/5312495.html bat文件内容如下,加入到计划任务执行 :: 清理IIS日志文件 :: 备份MySql数据库 @ ...
- iOS-Xib获取view尺寸的问题
用xib创建的视图,我们一般要在控制器中获取对应的view尺寸,但经常我们没法获取到,或者获取的不准 如果通过xib加载出来的view尺寸是不正确的, 在xib中这个view不管你怎么设置都是治标不治 ...
- websockify文档
一.官网地址 地址:https://github.com/novnc/websockify 二.开启代理 1.单台服务器 python /usr/local/websockify/websockify ...
- 018 Android Activity界面移入与移出的动画效果
1.平移动画 上一页移入动画 (-屏幕宽度,y)------>(0,y) 上一页移出动画 (0,y)-------------->(屏幕宽度,y) 下一页移入动画 (屏幕宽度,y)---- ...
- 015 Android md5密码加密及其工具类
1.md5加密介绍 MD5算法是广泛使用的杂凑函数,也就是哈希函数,英文全拼是:Message Digest Algorithm,对应的中文名字是消息摘要算法. MD5加密:将字符串转换成 32位的字 ...
- Mkdown常用语法
这篇笔记停了两天,今天开始整理, 写这篇笔记主要是加强下自己的mkdown语法知识, 也当作练手之作. Mkdown 语法简介 标题 [h1 - h6] # ~ ###### 一般# 作为标题, 只有 ...
- (一)Spring Security Demo 登陆与退出
文章目录 配置springSecurityFilterChain过滤器 配置身份验证 加载配置 登陆项目 退出 下面的代码需要spring环境的支持: 看这个系列博客之前,需要这个博客,大概了解下 s ...
- JAVA基础学习_命名规范和注释
一.命名规范 1. 项目名全部小写 2. 包名统一使用小写,点分隔符之间有且仅有一个自然语义的英语单词,包名统一使用单数形式.如果类名有复数含义,类名可以使用复数形式. 实际应用中: 各层命名规约: ...
- CSS实现自适应分隔线的N种方法
分割线是网页中比较常见的一类设计了,比如说知乎的更多回答 这里的自适应是指两边的横线会随着文字的个数和父级的宽度自适应 偷偷的看了一下知乎的实现,很显然是用一块白色背景覆盖的,加一点背景就露馅了 心想 ...
- my linux cmd
常用的linux命令 一.vi yy 复制当前行 u 撤销 p 粘贴 dd 删除当前行 set nu 显示行号 gg 首行 G 末行 二.用户管理相关 useradd 添加用户 (默认创建一个与用 ...