tip: quickly visit all conflicts in vim

Martin Pool mbp at sourcefrog.net
Mon Apr 2 00:59:54 BST 2007


On 4/2/07, John Arbash Meinel <john at arbash-meinel.com> wrote:
> Interesting. I actually usually use:
>
> /<<<<\|====\|>>>>
>
> Since that lets me jump to the 3 portions of a conflict marker. (I use 4
> because we use 7 conflict markers, and 4 makes us only match 1 time per
> conflict but is easier to type.)
>
> I frequently use this to start a range, and then use "nVndndd" (next,
> Visual Select Line, next, delete, next, delete line)

Of course you don't really need the visual mode -- 'dn' deletes from
the cursor up to the next match -- but it gives a chance to check what
will be done.

-- 
Martin



More information about the bazaar mailing list