Скачать или смотреть Vim universe. Vim as a diff tool

Turn Vim into a yet another diff viewer tool, like DiffMerge or kdiff3. Explore diff options, patch generation algorithm, use it as a Git difftool and more...

Topics discussed:
several ways to enter and exit diff mode
running with with a clean configuration (without your Vimrc)
configuring diff options
explore diff algorithm or how Vim calculates diff hunks and generates patches
detect when Vim is in a diff mode and turn off syntax highlighting and spell checking
tweak colors in a diff mode by working with Vim highlight groups
configure Vim as a Git difftool
smartly quit diff mode by closing both sides/windows of a file comparison
diff navigation shortcuts
work with diff hunks even when Vim is not in a diff mode using https://github.com/airblade/vim-gitgu...

Test Vimrc configuration from this demo: https://gist.github.com/samoshkin/90c...

My production Vimrc configuration: https://github.com/samoshkin/dotvim