An intuitive context menu based diff plugin for Sublime Text http://facelessuser.github.io/EasyDiff/
Python
Switch branches/tags
Permalink
Failed to load latest commit information.
docs Rework menus and add support commands (#24) May 28, 2017
lib Rework menus and add support commands (#24) May 28, 2017
messages Rework menus and add support commands (#24) May 28, 2017
tests Rework menus and add support commands (#24) May 28, 2017
.dictionary Rework menus and add support commands (#24) May 28, 2017
.gitignore Use mkdocs for docs Apr 23, 2015
.prospector.yml Rework menus and add support commands (#24) May 28, 2017
.travis.yml Rework menus and add support commands (#24) May 28, 2017
CHANGES.md Grammar fix in changelog May 29, 2017
Default.sublime-commands Optional quick panel access Sep 8, 2014
LICENSE Rework menus and add support commands (#24) May 28, 2017
Main.sublime-menu Rework menus and add support commands (#24) May 28, 2017
README.md Rework menus and add support commands (#24) May 28, 2017
dependencies.json Rework menus and add support commands (#24) May 28, 2017
easy_diff.py Rework menus and add support commands (#24) May 28, 2017
easy_diff.sublime-settings Rework menus and add support commands (#24) May 28, 2017
easy_diff_basic.py Rework menus and add support commands (#24) May 28, 2017
easy_diff_dynamic_menu.py Rework menus and add support commands (#24) May 28, 2017
easy_diff_global.py Fix PEP257 lint failure Oct 19, 2015
easy_diff_version_control.py Rework menus and add support commands (#24) May 28, 2017
messages.json Rework menus and add support commands (#24) May 28, 2017
mkdocs.yml Fix repo reference in documents config May 29, 2017
run_tests.sh Rework menus and add support commands (#24) May 28, 2017
setup.cfg Rework menus and add support commands (#24) May 28, 2017
support.py Rework menus and add support commands (#24) May 28, 2017

README.md

Unix Build Status Package Control Downloads License

EasyDiff

EasyDiff is a diff tool for comparing files in Sublime Text in special diff tabs or in your preferred external diff viewer.

menus

Features

  • Allows comparing views, selections, multi-selections, and clipboard combinations.
  • Can compare working copy against the base or previous revision of a file in SVN, Git, and Mercurial (requires some setup and configuration).
  • Dynamic context menus for selecting left side and right side compare. Dynamic menus show what file is on left side (think Beyond Compare context menus).
  • View diffs in a view buffer or output panel.
  • You can selectively hide version control menus or disable the command completely via the settings file.
  • Can open diffs in external diff programs if desired (requires some setup and configuration).
  • Show only internal diff options, only external options, or show both depending on your needs and preferences.

Documentation

http://facelessuser.github.io/EasyDiff/

License

EasyDiff is released under the MIT license.

Copyright (c) 2013 - 2015 Isaac Muse isaacmuse@gmail.com

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.