Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes. With contributions from Sebastian Pape (spape) and Jiri Urban (jiriurban)
- Total 247K
- Win 134K
- OS X 74K
- Linux 39K
|May 25||May 24||May 23||May 22||May 21||May 20||May 19||May 18||May 17||May 16||May 15||May 14||May 13||May 12||May 11||May 10||May 9||May 8||May 7||May 6||May 5||May 4||May 3||May 2||May 1||Apr 30||Apr 29||Apr 28||Apr 27||Apr 26||Apr 25||Apr 24||Apr 23||Apr 22||Apr 21||Apr 20||Apr 19||Apr 18||Apr 17||Apr 16||Apr 15||Apr 14||Apr 13||Apr 12||Apr 11||Apr 10|
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
Check the wiki for more tips
- Using Package Control, install “FileDiffs”
Open the Sublime Text Packages folder
- OS X: ~/Library/Application Support/Sublime Text 3/Packages/
- Windows: %APPDATA%/Sublime Text 3/Packages/
- Linux: ~/.Sublime Text 3/Packages/ or ~/.config/sublime-text-3/Packages
clone this repo
Install keymaps for the commands (see Example.sublime-keymap for my preferred keys)
Sublime Text 2
- Open the Sublime Text 2 Packages folder
clone this repo, but use the
git clone -b st2 email@example.com:colinta/SublimeFileDiffs
git clone -b st2 https://github.com/colinta/SublimeFileDiffs.git
Add External Diff Tool (optional)
(IMPORTANT: You might need to make a symlink (e.g. in /usr/local/bin) pointing to the command line tool of your external diff tool)
Preferences > Package Settings > FileDiffs > Settings - Default
Uncomment one of the examples or write your own command to open external diff tool.
This command may need to be a full path (e.g.
/usr/local/bin/ksdiff), if the command isn't in your
- A generic setting
FileDiffs.sublime-settingswhich could be overloaded for each parameter in a platform specific configuration
FileDiffs ($platform).sublime-settingsin the
Settings - User
- Environment variable expansions for
cmdparameter in the settings
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
The rest of the commands do not need to be bound (accessible from the menu):
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)
file_diff_selections: Shows the diff of the first and second selected regions. The file_diff_menu command checks for exactly two regions selected, otherwise it doesn't display this command.
file_diff_saved: Shows the diff of the current file or selection(s) and the saved file.
file_diff_file: Shows the diff of the current file or selection(s) and a file that is in the current project.
file_diff_tab: Shows the diff of the current file or selection(s) and an open file (aka a file that has a tab).
file_diff_previous: Shows the diff of the current file or selection(s) and the previous activated file.
- Sebastian Pape for adding support for using an external diff tool
- Starli0n for merging the ST2 and ST3 branches into one branch,
- and for adding the “Diff file with previous” feature
- dnsmkl for helping with diffing temporary files