Use vimdiff as git mergetool, without prompting.
Configure line endings in gitconfig.
Disable crash reporter daemon.