created by

Dirk Wallenstein

script type

utility

description

Lock to a range of lines delineated by conflict markers and skip through or assemble different content for that section. For more, see github and the accompanying blog post: https://github.com/dirkwallenstein/vim-conflict-slides http://vertuxeltes.blogspot.de/2013/07/conflict-resolution-with-vim-conflict.html

install details

Please use Vundle or pathogen.

Click on the package to download.

package	script version	date	Vim version	user	release notes
conflictslides-1.0.0.tar.gz	1.0.0	2013-07-06	7.3	Dirk Wallenstein	Initial upload

ip used for rating: 18.117.142.128