remove git autocorrect configuration

doing nothing is safer
add git mergetool configuration