aboutsummaryrefslogtreecommitdiffstats
path: root/bundle/unimpaired-vcs-conflict-movement/autoload
AgeCommit message (Collapse)Author
2015-02-09Add vim-unimpaired merge conflict movementsTeddy Wing
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.