Skip to content

Commit

Permalink
(New Files) Implement possibility to add an external DiffTool in addi…
Browse files Browse the repository at this point in the history
…tion to the FileDiff output in Sublime.
  • Loading branch information
Sebastian Pape committed Aug 8, 2012
1 parent ac066c3 commit b5bcf9f
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 0 deletions.
12 changes: 12 additions & 0 deletions FileDiffs.sublime-settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{

// just uncomment one of the examples
// or write your own command

// opendiff (FileMerge)
//"cmd": ["opendiff", "$file1", "$file2"]

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

}
27 changes: 27 additions & 0 deletions Main.sublime-menu
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"caption": "Preferences",
"mnemonic": "n",
"id": "preferences",
"children":
[
{
"caption": "Package Settings",
"mnemonic": "P",
"id": "package-settings",
"children":
[
{
"caption": "FileDiffs",
"children":
[
{ "command": "open_file", "args": {"file": "${packages}/FileDiffs/FileDiffs.sublime-settings"}, "caption": "Settings – Default" },
{ "command": "open_file", "args": {"file": "${packages}/User/FileDiffs.sublime-settings"}, "caption": "Settings – User" },
{ "caption": "-" }
]
}
]
}
]
}
]
1 change: 1 addition & 0 deletions package-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +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 comments on commit b5bcf9f

Please sign in to comment.