A git mirror of threesome.vim.
Python VimL JavaScript Shell
Pull request Compare This branch is 4 commits behind sjl:master.
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
autoload
doc
plugin
site
syntax
.gitignore
.hgignore
.hgtags
LICENSE
README.markdown
package.sh

README.markdown

Threesome

Threesome is a Vim plugin for resolving conflicts during three-way merges.

Visit the site for more information.