feat(ST2.EditorPackages): bump up all packages
- Refresh PackageCache with latest versions of everything
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
Copyright (c) 2012, Colin T.A. Gray
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
The views and conclusions contained in the software and documentation are those
|
||||
of the authors and should not be interpreted as representing official policies,
|
||||
either expressed or implied, of this project.
|
@@ -7,6 +7,8 @@ Shows diffs - also in an external diff tool - between the current file, or selec
|
||||
Installation
|
||||
------------
|
||||
|
||||
### Sublime Text 2
|
||||
|
||||
1. Using Package Control, install "FileDiffs"
|
||||
|
||||
Or:
|
||||
@@ -20,6 +22,13 @@ Or:
|
||||
2. clone this repo
|
||||
3. Install keymaps for the commands (see Example.sublime-keymap for my preferred keys)
|
||||
|
||||
### Sublime Text 3
|
||||
|
||||
1. Open the Sublime Text 2 Packages folder
|
||||
2. clone this repo, but use the `st3` branch
|
||||
|
||||
git clone -b st3 git@github.com:colinta/SublimeFileDiffs
|
||||
|
||||
Add External Diff Tool
|
||||
--------
|
||||
|
||||
|
@@ -101,6 +101,8 @@ class FileDiffCommand(sublime_plugin.TextCommand):
|
||||
self.diff_with_external(a, b, from_file, to_file)
|
||||
|
||||
if open_in_sublime:
|
||||
# fix diffs
|
||||
diffs = map(lambda line: (line and line[-1] == "\n") and line or line + "\n", diffs)
|
||||
self.diff_in_sublime(diffs)
|
||||
|
||||
def diff_with_external(self, a, b, from_file=None, to_file=None):
|
||||
|
@@ -1 +1 @@
|
||||
{"url": "https://github.com/spape/SublimeFileDiffs", "version": "1.5.0", "description": "Shows diffs - also in an external diff tool - between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes."}
|
||||
{"url": "https://github.com/colinta/SublimeFileDiffs", "version": "2013.07.09.15.11.56", "description": "Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes."}
|
Reference in New Issue
Block a user