vim-mergetool
vim-mergetool copied to clipboard
`set nomodifiable` precludes use of `:diffput`
When loading a revision into a new buffer, this plugin will do set nomodifiable on said buffer, which means you can't use :diffput to resolve conflicts. There are obviously ways of working around it, but being able to use :diffput would be preferable since the folding behavior is dependent on the diffs.