Skip to content

Commit b5bcf9f

Browse files
author
Sebastian Pape
committed
(New Files) Implement possibility to add an external DiffTool in addition to the FileDiff output in Sublime.
1 parent ac066c3 commit b5bcf9f

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

FileDiffs.sublime-settings

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
3+
// just uncomment one of the examples
4+
// or write your own command
5+
6+
// opendiff (FileMerge)
7+
//"cmd": ["opendiff", "$file1", "$file2"]
8+
9+
// ksdiff (Kaleidoscope)
10+
//"cmd": ["ksdiff", "$file1", "$file2"]
11+
12+
}

Main.sublime-menu

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[
2+
{
3+
"caption": "Preferences",
4+
"mnemonic": "n",
5+
"id": "preferences",
6+
"children":
7+
[
8+
{
9+
"caption": "Package Settings",
10+
"mnemonic": "P",
11+
"id": "package-settings",
12+
"children":
13+
[
14+
{
15+
"caption": "FileDiffs",
16+
"children":
17+
[
18+
{ "command": "open_file", "args": {"file": "${packages}/FileDiffs/FileDiffs.sublime-settings"}, "caption": "Settings – Default" },
19+
{ "command": "open_file", "args": {"file": "${packages}/User/FileDiffs.sublime-settings"}, "caption": "Settings – User" },
20+
{ "caption": "-" }
21+
]
22+
}
23+
]
24+
}
25+
]
26+
}
27+
]

package-metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"url": "https://github.com/spape/SublimeFileDiffs", "version": "0.9", "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."}

0 commit comments

Comments
 (0)