This is a file comparison plugin for Sublime Text 3/4, it relies on its internal Incremental Diff feature.
Enjoy!
- To present inline diff of content of two opened tabs to one another.
- To pass the content of two opened tabs to Kaleidoscope diff app.
- To clear inline diff.
Please install Sublime Package Control first. Then inside Package Control: Install Package, type Diffable and then click to confirm.
It's as easy as just:
- Install the plugin.
- Open two tabs in a row either way.
- Hit bindings bellow or run it by Sublime Text Command Pallet by typing
Diffable
. - Bonus: By hitting
super+k
followed bysuper+/
, you'll get inline diff view provided by Sublime Text.
- To compare and show the diffs, press
super + k
followed bysuper + d
. - To clear the marked lines, press
super + k
followed bysuper + c
. - To pass presented content into Kaleidoscope app press
super + k
followed bysuper + o
.
{ "keys": ["super+k", "super+d"], "command": "diffable", "args": {"action": "inline"} }
{ "keys": ["super+k", "super+c"], "command": "diffable", "args": {"action": "clear"} }
{ "keys": ["super+k", "super+o"], "command": "diffable", "args": {"action": "kaleidoscope"} }
{ "keys": ["ctrl+k", "ctrl+d"], "command": "diffable", "args": {"action": "inline"} }
{ "keys": ["ctrl+k", "ctrl+c"], "command": "diffable", "args": {"action": "clear"} }
Warning There's no version of Kaleidoscope app for both Windows and Linux.
Inline diffs looks corrupted on git repos uncommited changes, to fix that please commit or reset your local changes.
Note This plugin is a refactored and updated verion of an ammazing plugin https://github.com/zsong/diffy which is seems depricated long ago.
Note None of the team stand behind Kaleidoscope app have paid me any amount for being a part of this plugin behind the scene. Though they were so kind to provide me a code snippet that let me integrate with their tool in a smooth way.
Note Therefore any other diffing tool are more than welcome to become integrated on the same terms as they were — by PR to that repo.