Skip to content

Commit 4890a86

Browse files
committed
updated README and fixed whitespace
1 parent baa1fe3 commit 4890a86

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
FileDiffs Plugin
22
================
33

4-
Shows diffs - also in an external diff tool - between the current file, or
5-
selection(s) in the current file, and clipboard, another file, or unsaved
6-
changes.
4+
Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes. Can be configured to show diffs in an external diff tool
75

86
Help!
97
-----
@@ -20,10 +18,9 @@ Installation
2018
Or:
2119

2220
1. Open the Sublime Text Packages folder
23-
2421
- OS X: ~/Library/Application Support/Sublime Text 3/Packages/
2522
- Windows: %APPDATA%/Sublime Text 3/Packages/
26-
- Linux: ~/.Sublime Text 3/Packages/ or ~/.config/sublime-text-2/Packages
23+
- Linux: ~/.Sublime Text 3/Packages/ or ~/.config/sublime-text-3/Packages
2724

2825
2. clone this repo
2926
3. Install keymaps for the commands (see Example.sublime-keymap for my preferred keys)
@@ -48,10 +45,9 @@ Add External Diff Tool *(optional)*
4845
Commands
4946
--------
5047

51-
`file_diff_menu`: Shows a menu to select one of the file_diff commands. If you
52-
use the bindings in Example.sublime-keymap, this is bound to `ctrl+shift+d`.
48+
`file_diff_menu`: Shows a menu to select one of the file_diff commands. If you use the bindings in Example.sublime-keymap, this is bound to `ctrl+shift+d`.
5349

54-
The rest of the commands are not bound by default:
50+
The rest of the commands do not need to be bound (accessible from the menu):
5551

5652
`file_diff_clipboard`: Shows the diff of the current file or selection(s) and the clipboard (the clipboard is considered the "new" file unless `reverse` is True)
5753

file_diffs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ def run_diff(self, a, b, from_file=None, to_file=None):
7474

7575
try:
7676
file_a_exists = os.path.exists(a)
77-
except ValueError:
77+
except ValueError:
7878
file_a_exists = False
7979

8080
try:
8181
file_b_exists = os.path.exists(b)
82-
except ValueError:
82+
except ValueError:
8383
file_b_exists = False
8484

8585
if file_a_exists:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "FileDiffs",
3-
"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.",
3+
"description": "Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes.",
44
"author": "Colin T.A. Gray (colinta), Sebastian Pape (spape), Jiri Urban (jiriurban)",
55
"details": "https://github.com/colinta/SublimeFileDiffs",
66
"labels": ["diff/merge"],

0 commit comments

Comments
 (0)