Skip to content

raphael-proust/threesome.vim

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

82 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Threesome

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

Visit the site for more information.

Packages

No packages published

Languages

  • Python 80.4%
  • Vim Script 16.5%
  • JavaScript 2.2%
  • Shell 0.9%