Added tag v1.1.0 for changeset 61fde9091c13
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Sat, 08 Oct 2016 13:09:34 +0000 |
| parents |
04114f5e102d |
| children |
31b1a5a3b5ff |
Splice is a Vim plugin for resolving three-way merges. It's inspired by Adobe
Lightroom's user interface. [Watch the demo screencast][screencast] in HD on
Vimeo to get an idea of how it works.
**Full Documentation:** `:help splice`
**Source (Mercurial):** <http://bitbucket.org/sjl/splice.vim>
**Source (Git):** <http://github.com/sjl/splice.vim>
**Issues:** <http://github.com/sjl/splice.vim/issues>
**License:** [MIT/X11][license]
[license]: http://www.opensource.org/licenses/mit-license.php
[screencast]: http://vimeo.com/25764692