Skip to content

Commit 265391a

Browse files
committed
whitespace
1 parent 0a5b545 commit 265391a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

FileDiffs.sublime-settings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// just uncomment one of the examples
44
// or write your own command
55

6-
// opendiff (FileMerge)
7-
// "cmd": ["opendiff", "$file1", "$file2"]
6+
// opendiff (FileMerge)
7+
// "cmd": ["opendiff", "$file1", "$file2"]
88

99
// ksdiff (Kaleidoscope)
1010
// "cmd": ["ksdiff", "$file1", "$file2"]

file_diffs.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
FILE_DIFFS = [CLIPBOARD, SAVED, FILE, TAB]
2222

23+
2324
class FileDiffMenuCommand(sublime_plugin.TextCommand):
2425
def run(self, edit):
2526
menu_items = FILE_DIFFS[:]
@@ -67,7 +68,7 @@ def diff_content(self):
6768

6869
def run_diff(self, a, b, from_file=None, to_file=None):
6970
from_content = a
70-
to_content = b
71+
to_content = b
7172

7273
if os.path.exists(a):
7374
if from_file is None:
@@ -111,11 +112,10 @@ def diff_with_external(self, a, b, from_file=None, to_file=None):
111112
command = [c.replace(u'$file2', to_file) for c in command]
112113
self.view.window().run_command("exec", {"cmd": command})
113114

114-
115115
def show_diff(self, diffs):
116116
if diffs:
117-
command = SETTINGS.get('open_in_sublime')
118-
if command is None or command is True:
117+
command = SETTINGS.get('open_in_sublime')
118+
if command is None or command is True:
119119
scratch = self.view.window().new_file()
120120
scratch.set_scratch(True)
121121
scratch.set_syntax_file('Packages/Diff/Diff.tmLanguage')

0 commit comments

Comments
 (0)