Changes gitconfig email
Sets vimdiff as mergetool