vim editor and diff for git