Vim diff

From wikinotes