Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
5 lines (3 sloc) 142 Bytes

vim-git-conflict-edit

Edit conflicted Git files in Vim by grepping for conflict markers and loading into quickfix list