Added vimdiff navigation