Maybe this is obvious but I don't mind saying I hadn't thought of it before: :grep '^>>>>>>>' **/* then :cnext to go through all the conflicts. I have f12 set to do that: nmap <F12> :cnext ^Mzz nmap <S-F12> :cprev ^Mzz It might be nice if bzr conflicts (optionally) reported in a style more similar to compiler or grep output... -- Martin