rhysd/conflict-marker.vim

This is stars and forks stats for /rhysd/conflict-marker.vim repository. As of 10 May, 2024 this repository has 444 stars and 16 forks.

conflict-marker.vim Highlight, jump and resolve conflict markers quickly. conflict-marker.vim is Vim plugin for developers fighting against conflicts. All features are available if and only if an opened buffer contains a conflict marker. conflict-marker.vim does: highlight conflict markers. jump among conflict markers. jump within conflict block; beginning, separator and end of the block. resolve conflict with various strategies; theirs, ours, none and both strategies. support both diff2 (Git default)...