dotvim/bundle/unimpaired-vcs-conflict-movement/plugin, branch master My vim configuration Add vim-unimpaired merge conflict movements 2015-02-09T23:59:38+00:00 Teddy Wing 2015-02-09T23:59:38+00:00 c73c88e24c819e1ad92496723096ea5539b2c826 Grab the movement commands `[n` and `]n` to move between merge conflict markers. Makes it easier to get around when fixing conflicts in vimdiff. Copied from Tim Pope's vim-unimpaired plugin. 
Grab the movement commands `[n` and `]n` to move between merge conflict
markers. Makes it easier to get around when fixing conflicts in vimdiff.

Copied from Tim Pope's vim-unimpaired plugin.